diff --git a/.github/workflows/docker-debug.yml b/.github/workflows/docker-debug.yml deleted file mode 100644 index 743d6ee5..00000000 --- a/.github/workflows/docker-debug.yml +++ /dev/null @@ -1,106 +0,0 @@ -name: Clone of Docker Build and Push - -on: - workflow_dispatch: - -env: - DOCKERHUB_PREFIX: docker.io - GITHUB_CONTAINER_PREFIX: ghcr.io - DOCKER_IMAGE: WGDashboard - -jobs: - docker_build_debug: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - strategy: - fail-fast: false - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - registry: ${{ env.DOCKERHUB_PREFIX }} - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.GITHUB_CONTAINER_PREFIX }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: linux/amd64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Extract Docker metadata from environment - id: meta - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.DOCKERHUB_PREFIX }}/donaldzou/${{ env.DOCKER_IMAGE }} - ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE }} - tags: | - type=ref,event=branch - type=ref,event=tag - type=sha,format=short,prefix= - - - name: Build and export Docker image - uses: docker/build-push-action@v6 - with: - context: . - file: ./docker/Dockerfile - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64 - - docker_scan_debug: - if: ${{ github.event_name != 'pull_request' }} - runs-on: ubuntu-latest - needs: docker_build_debug - steps: - - name: Log in to Docker Hub - uses: docker/login-action@v3 - with: - registry: ${{ env.DOCKERHUB_PREFIX }} - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.GITHUB_CONTAINER_PREFIX }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Docker Scout CVEs - uses: docker/scout-action@v1 - with: - command: cves - image: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE }}:main - only-severities: critical,high - only-fixed: true - write-comment: true - github-token: ${{ secrets.GITHUB_TOKEN }} - exit-code: true - - - name: Docker Scout Compare - uses: docker/scout-action@v1 - with: - command: compare - # Set to Github for maximum compat - image: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE }}:main - to: ${{ env.GITHUB_CONTAINER_PREFIX }}/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE }}:latest - only-severities: critical,high - ignore-unchanged: true - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b7604428..1cc04926 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,7 @@ on: push: branches: - 'main' + - 'development' - '**dev' tags: - '*'