diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 207dc3ad..b082ddb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -111,7 +111,7 @@ jobs: deploy: name: Deploy over SSH runs-on: ubuntu-latest - needs: [docker-push-api, docker-push-webapp] + needs: [docker-push-api, docker-push-webapp, docker-push-question-generator] steps: - name: Deploy over SSH uses: fifsky/ssh-action@master @@ -132,4 +132,4 @@ jobs: echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env echo "API_URI=http://${{ secrets.DEPLOY_HOST }}:8080" >> .env docker compose --profile prod down - docker compose --profile prod up -d --pull + docker compose --profile prod up -d --pull always diff --git a/questiongenerator/Dockerfile b/questiongenerator/Dockerfile index 6e6d725b..3c27189d 100644 --- a/questiongenerator/Dockerfile +++ b/questiongenerator/Dockerfile @@ -15,5 +15,5 @@ ARG DATABASE_PASSWORD ENV DATABASE_URL jdbc:postgresql://WIQ_DB:5432/wiq ENV DATABASE_USER $DATABASE_USER ENV DATABASE_PASSWORD $DATABASE_PASSWORD -COPY --from=build /api/target/QuestionGenerator-1.0-SNAPSHOT.jar app.jar +COPY --from=build /questiongenerator/target/QuestionGenerator-1.0-SNAPSHOT.jar app.jar ENTRYPOINT ["java","-jar","app.jar"] \ No newline at end of file