diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 9ff9974..5d0278c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -78,14 +78,14 @@ jobs: if: steps.changes.outputs.frontend == 'true' uses: docker/build-push-action@v4 with: - file: frontend/Dockerfile + file: Dockerfile context: "{{defaultContext}}:frontend" platforms: linux/amd64 push: true tags: ${{ steps.frontend-meta.outputs.tags }} # API - - name: "[Frontend] Build and push" + - name: "[API] Build and push" if: steps.changes.outputs.api == 'true' uses: docker/build-push-action@v4 with: @@ -100,7 +100,7 @@ jobs: if: steps.changes.outputs.bot == 'true' uses: docker/build-push-action@v4 with: - file: telegram_bot/Dockerfile + file: Dockerfile context: "{{defaultContext}}:telegram_bot" platforms: linux/amd64 push: true diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 10d959c..3b9592b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -4,7 +4,7 @@ FROM node:latest as build WORKDIR /usr/local/app # Copy the project files to the container -COPY frontend/ /usr/local/app/ +COPY . /usr/local/app/ # Install dependencies RUN npm install @@ -16,8 +16,8 @@ FROM nginx:latest COPY --from=build /usr/local/app/dist/aktienbot /usr/share/nginx/html # Copy configuration files -COPY frontend/deploy/nginx.conf /etc/nginx -COPY frontend/deploy deploy/ +COPY ./deploy/nginx.conf /etc/nginx +COPY ./deploy deploy/ # Change file permissions RUN chmod +x ./deploy/healthcheck.sh diff --git a/telegram_bot/Dockerfile b/telegram_bot/Dockerfile index 97d6272..ead430b 100644 --- a/telegram_bot/Dockerfile +++ b/telegram_bot/Dockerfile @@ -17,5 +17,6 @@ COPY . /srv/flask_app # Change file permissions RUN chmod +x ./deploy/start.sh + # Run the app CMD ["./deploy/start.sh"] \ No newline at end of file