tools/github actions: revert temporary changes used for trivy tests on fork/branch
This commit is contained in:
parent
d48e06f438
commit
22b4044986
1 changed files with 10 additions and 10 deletions
20
.github/workflows/docker-latest.yml
vendored
20
.github/workflows/docker-latest.yml
vendored
|
@ -1,7 +1,7 @@
|
||||||
name: Build/push Docker image (master/latest)
|
name: Build/push Docker image (master/latest)
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master, trivy ]
|
branches: [ master ]
|
||||||
jobs:
|
jobs:
|
||||||
docker-build:
|
docker-build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -11,11 +11,11 @@ jobs:
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
# - name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
# uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
# with:
|
with:
|
||||||
# username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
# password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
|
@ -35,10 +35,10 @@ jobs:
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
# tags: |
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
# ${{ secrets.DOCKER_IMAGE }}:trivy
|
tags: |
|
||||||
# ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy
|
${{ secrets.DOCKER_IMAGE }}:latest
|
||||||
tags: ghcr.io/${{ secrets.DOCKER_IMAGE }}:trivy
|
ghcr.io/${{ secrets.DOCKER_IMAGE }}:latest
|
||||||
- name: Image digest
|
- name: Image digest
|
||||||
run: echo ${{ steps.docker_build.outputs.digest }}
|
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||||
- name: Run trivy image scanner
|
- name: Run trivy image scanner
|
||||||
|
|
Loading…
Reference in a new issue