diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 54314f8..c19847f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y bash build-essential git zsh \ # Install Oh My Zsh RUN bash -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \ - sed -i 's/ZSH_THEME="robbyrussell"/ZSH_THEME="agnoster"/' ~/.zshrc + sed -i 's/ZSH_THEME="robbyrussell"/ZSH_THEME="agnoster"/' /root/.zshrc # Optional: Set zsh as the default shell for the root user RUN chsh -s $(which zsh) @@ -17,6 +17,10 @@ ARG GIT_USERNAME ARG GIT_PASSWORD RUN git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@git.workouttest.org/bossanyit/voxadata_app /app/voxadata_app +# Clone the second repository +RUN git clone https://${GIT_USERNAME}:${GIT_PASSWORD}@git.workouttest.org/bossanyit/voxadata_bot /app/voxadata_bot + + RUN npm install -g corepack # Install and use yarn 4.x @@ -24,17 +28,21 @@ RUN corepack enable && corepack prepare yarn@4.1.0 --activate # Set the working directory to /app/voxadata_app WORKDIR /app/voxadata_app - RUN ls -la - -# Copies package.json, yarn.lock and other yarn files to Docker environment -#COPY package.json ./.yarn/releases/yarn-4.1.0.cjs ./ - # Check Yarn configuration and install dependencies RUN yarn config set cacheFolder .yarn/cache && yarn install -# Expose port 3000 + +# Set the working directory to /app/voxadata_bot +WORKDIR /app/voxadata_bot +RUN ls -la +# Check Yarn configuration and install dependencies +RUN yarn config set cacheFolder .yarn/cache && yarn install + + +# Expose ports EXPOSE 3000 +EXPOSE 3001 # Run the app when the container launches CMD ["tail", "-f", "/dev/null"] diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3daf187..215249f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,10 +18,10 @@ "mongodb.mongodb-vscode" ] } - } + }, // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [3000, 27017], + "forwardPorts": [3000, 3001, 27017], // Use 'postCreateCommand' to run commands after the container is created. // "postCreateCommand": "yarn install",