Merge pull request #1139 from cybozu/update-golang

Update golang-all 1.21 and 1.20
cybozu · Nov 8, 2023 · 258eb9d · 258eb9d
2 parents 668e4c0 + eb5dace
commit 258eb9d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/actions/build_push/action.yaml b/.github/actions/build_push/action.yaml
@@ -46,7 +46,7 @@ runs:
         # The stdout should be either "" or "found".
         if [ "$c" = "" ]; then
             echo "BUILDS_TAG=ghcr.io/cybozu/$image:$TAG" >> $GITHUB_ENV
-            
+
             if [ -f $dir/BRANCH ]; then
               if echo $TAG | grep -q -e - ; then
                 echo ===== Skip pushing branch tags for pre-release $TAG =====
@@ -69,7 +69,7 @@ runs:
       shell: bash
       run: |
         enable_arm64=${{ inputs.enable_arm64 }}
-        if [ "$enable_arm64" = "true" ]; then 
+        if [ "$enable_arm64" = "true" ]; then
           echo "PLATFORM=linux/amd64,linux/arm64" >> $GITHUB_ENV
         else
           echo "PLATFORM=linux/amd64" >> $GITHUB_ENV
@@ -91,12 +91,12 @@ runs:
           ${{ env.BUILDS_TAG }}
           ${{ env.BUILDS_BRANCH }}
     - name: Install Trivy
-      if: inputs.scan && env.BUILDS_TAG != null
+      if: inputs.scan == 'true' && env.BUILDS_TAG != null && github.event_name != 'pull_request'
       shell: bash
       run: |
         curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
     - name: Scan images
-      if: inputs.scan == 'true' && env.BUILDS_TAG != null
+      if: inputs.scan == 'true' && env.BUILDS_TAG != null && github.event_name != 'pull_request'
       shell: bash
       env:
         YAMORY_ACCESS_TOKEN: ${{ inputs.yamory_token }}

diff --git a/golang-all/golang-1.20-focal/Dockerfile b/golang-all/golang-1.20-focal/Dockerfile
@@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:20.04
 LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"
 
 ARG TARGETARCH
-ARG GO_VERSION=1.20.10
+ARG GO_VERSION=1.20.11
 
 ENV GOARCH=${TARGETARCH}
 ENV GOPATH=/go

diff --git a/golang-all/golang-1.20-focal/TAG b/golang-all/golang-1.20-focal/TAG
@@ -1 +1 @@
-1.20.10.1_focal
+1.20.11.1_focal
diff --git a/golang-all/golang-1.20-jammy/Dockerfile b/golang-all/golang-1.20-jammy/Dockerfile
@@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:22.04
 LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"
 
 ARG TARGETARCH
-ARG GO_VERSION=1.20.10
+ARG GO_VERSION=1.20.11
 
 ENV GOARCH=${TARGETARCH}
 ENV GOPATH=/go

diff --git a/golang-all/golang-1.20-jammy/TAG b/golang-all/golang-1.20-jammy/TAG
@@ -1 +1 @@
-1.20.10.1_jammy
+1.20.11.1_jammy
diff --git a/golang-all/golang-1.21-focal/Dockerfile b/golang-all/golang-1.21-focal/Dockerfile
@@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:20.04
 LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"
 
 ARG TARGETARCH
-ARG GO_VERSION=1.21.3
+ARG GO_VERSION=1.21.4
 
 ENV GOARCH=${TARGETARCH}
 ENV GOPATH=/go

diff --git a/golang-all/golang-1.21-focal/TAG b/golang-all/golang-1.21-focal/TAG
@@ -1 +1 @@
-1.21.3.1_focal
+1.21.4.1_focal
diff --git a/golang-all/golang-1.21-jammy/Dockerfile b/golang-all/golang-1.21-jammy/Dockerfile
@@ -4,7 +4,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/cybozu/ubuntu-dev:22.04
 LABEL org.opencontainers.image.source "https://github.com/cybozu/neco-containers"
 
 ARG TARGETARCH
-ARG GO_VERSION=1.21.3
+ARG GO_VERSION=1.21.4
 
 ENV GOARCH=${TARGETARCH}
 ENV GOPATH=/go

diff --git a/golang-all/golang-1.21-jammy/TAG b/golang-all/golang-1.21-jammy/TAG
@@ -1 +1 @@
-1.21.3.1_jammy
+1.21.4.1_jammy