From 4fbb1c7364a69a20db1428a41296ed3898af4f2b Mon Sep 17 00:00:00 2001 From: webpwnized Date: Sun, 15 Oct 2023 21:07:00 -0400 Subject: [PATCH] 1.0.50 Add variables to the github action --- .../workflows/build-and-push-to-dockerhub.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-and-push-to-dockerhub.yml b/.github/workflows/build-and-push-to-dockerhub.yml index f620a2e..8fdf9a7 100644 --- a/.github/workflows/build-and-push-to-dockerhub.yml +++ b/.github/workflows/build-and-push-to-dockerhub.yml @@ -42,45 +42,45 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and Export ${{ env,DATABASE_CONTAINER_NAME }} Container to Docker + name: Build and Export ${{ env.DATABASE_CONTAINER_NAME }} Container to Docker uses: docker/build-push-action@v5 with: context: . - file: ./${{ env,DATABASE_CONTAINER_NAME }}/Dockerfile + file: ./${{ env.DATABASE_CONTAINER_NAME }}/Dockerfile load: true - tags: webpwnized/mutillidae:${{ env,DATABASE_CONTAINER_NAME }} + tags: webpwnized/mutillidae:${{ env.DATABASE_CONTAINER_NAME }} - - name: Run Trivy vulnerability scanner on ${{ env,DATABASE_CONTAINER_NAME }} Container + name: Run Trivy vulnerability scanner on ${{ env.DATABASE_CONTAINER_NAME }} Container uses: aquasecurity/trivy-action@master with: - image-ref: 'webpwnized/mutillidae:${{ env,DATABASE_CONTAINER_NAME }}' + image-ref: 'webpwnized/mutillidae:${{ env.DATABASE_CONTAINER_NAME }}' format: 'sarif' - output: '${{ env,DATABASE_CONTAINER_NAME }}-trivy-scan-results.sarif' + output: '${{ env.DATABASE_CONTAINER_NAME }}-trivy-scan-results.sarif' - - name: Upload ${{ env,DATABASE_CONTAINER_NAME }} Container Trivy scan results to GitHub Security tab + name: Upload ${{ env.DATABASE_CONTAINER_NAME }} Container Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v2 with: - sarif_file: '${{ env,DATABASE_CONTAINER_NAME }}-trivy-scan-results.sarif' + sarif_file: '${{ env.DATABASE_CONTAINER_NAME }}-trivy-scan-results.sarif' - - name: Build and push ${{ env,DATABASE_CONTAINER_NAME }} container + name: Build and push ${{ env.DATABASE_CONTAINER_NAME }} container uses: docker/build-push-action@v5 with: context: . - file: ./${{ env,DATABASE_CONTAINER_NAME }}/Dockerfile + file: ./${{ env.DATABASE_CONTAINER_NAME }}/Dockerfile push: true - tags: webpwnized/mutillidae:${{ env,DATABASE_CONTAINER_NAME }} + tags: webpwnized/mutillidae:${{ env.DATABASE_CONTAINER_NAME }} - - name: Build and push ${{ env,DATABASE_CONTAINER_NAME }} container with version number + name: Build and push ${{ env.DATABASE_CONTAINER_NAME }} container with version number uses: docker/build-push-action@v5 with: context: . - file: ./${{ env,DATABASE_CONTAINER_NAME }}/Dockerfile + file: ./${{ env.DATABASE_CONTAINER_NAME }}/Dockerfile push: true - tags: webpwnized/mutillidae:${{ env,DATABASE_CONTAINER_NAME }}-${{ env.VERSION }} + tags: webpwnized/mutillidae:${{ env.DATABASE_CONTAINER_NAME }}-${{ env.VERSION }} - name: Build and push database_admin container