diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 5ad11df..035f415 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -10,13 +10,13 @@ jobs: uses: actions/checkout@v2 - name: Goto frontend and run tests run: cd frontend && npm i && npm test - test-e2e: + test-e2e: runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v2 - name: run e2e tests - run: docker compose -f docker-compose.e2e.yml up --build --exit-code-from e2e + run: docker compose -f docker-compose.e2e.yml up --build --exit-code-from e2e docker-build-and-push-to-dockerhub: needs: [test-client, test-e2e] if: github.ref == 'refs/heads/dev' @@ -37,12 +37,11 @@ jobs: push: true context: "{{defaultContext}}:frontend" file: Dockerfile.prod - tags: ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-frontend:latest + tags: ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-frontend:latest, ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-frontend:${{ github.sha }} - name: Build and push backend uses: docker/build-push-action@v4 with: push: true context: "{{defaultContext}}:backend" file: Dockerfile.prod - tags: ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-backend:latest - \ No newline at end of file + tags: ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-backend:latest, ${{ secrets.DOCKERHUB_USERNAME }}/wildrent-backend:${{ github.sha }}