diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 57c7bf259..098fa87b7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -63,7 +63,7 @@ jobs: gogs/gogs:latest ghcr.io/gogs/gogs:latest - name: Scan for container vulnerabilities - uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # 0.33.1 + uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0 with: image-ref: gogs/gogs:latest exit-code: '1' @@ -130,7 +130,7 @@ jobs: ghcr.io/gogs/gogs:next-latest registry.digitalocean.com/gogs/gogs:next-latest - name: Scan for container vulnerabilities - uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # 0.33.1 + uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0 with: image-ref: gogs/gogs:next-latest exit-code: '1' @@ -201,7 +201,7 @@ jobs: tags: | ttl.sh/gogs/gogs-${{ steps.short-sha.outputs.sha }}:7d - name: Scan for container vulnerabilities - uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # 0.33.1 + uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0 with: image-ref: ttl.sh/gogs/gogs-${{ steps.short-sha.outputs.sha }}:7d exit-code: '1' @@ -241,7 +241,7 @@ jobs: tags: | ttl.sh/gogs/gogs-next-${{ steps.short-sha.outputs.sha }}:7d - name: Scan for container vulnerabilities - uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # 0.33.1 + uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # 0.35.0 with: image-ref: ttl.sh/gogs/gogs-next-${{ steps.short-sha.outputs.sha }}:7d exit-code: '1' diff --git a/Dockerfile b/Dockerfile index e9b46f4f2..3d6a368d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ RUN apk --no-cache --no-progress add \ shadow \ socat \ tzdata \ - rsync + rsync \ + "zlib>1.3.2" ENV GOGS_CUSTOM=/data/gogs diff --git a/Dockerfile.next b/Dockerfile.next index c4d0c160f..bba2bca9c 100644 --- a/Dockerfile.next +++ b/Dockerfile.next @@ -26,7 +26,8 @@ RUN apk --no-cache --no-progress add \ curl \ git \ linux-pam \ - openssh-keygen + openssh-keygen \ + "zlib>1.3.2" ENV GOGS_CUSTOM=/data/gogs