Merge pull request #1153 from cybozu/update-images-handled-by-zeroalphat

Update some container images

.github/actions/build_push/action.yaml

@@ -34,7 +34,7 @@ runs:
   using: "composite"
   steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Extract targets
       shell: bash
       run: |
@@ -81,7 +81,7 @@ runs:
         make -C ${{ inputs.dir }} test
     - name: Build and push
       if: env.BUILDS_TAG != null
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: ${{ inputs.dir }}
         platforms: ${{ env.PLATFORM }}

.github/actions/setup/action.yaml

@@ -13,21 +13,21 @@ runs:
   using: "composite"
   steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: linux/amd64,linux/arm64/v8
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ inputs.github_token }}
     - name: Setup golang
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ inputs.go-version }}
     - name: Install container-tag-exists

.github/workflows/main.yaml

@@ -22,7 +22,7 @@ jobs:
             enable_arm64: true
             scan: "true"
           - dir: "./golang-all/golang-1.20-jammy"
-            container-image: "golang" 
+            container-image: "golang"
             enable_arm64: true
             scan: "true"
           - dir: "./golang-all/golang-1.21-focal"
@@ -50,12 +50,21 @@ jobs:
           - dir: "./fluent-bit"
             container-image: "fluent-bit"
             scan: "true"
+          - dir: "./bird"
+            container-image: "bird"
+            scan: "true"
+          - dir: "./serf"
+            container-image: "serf"
+            scan: "true"
+          - dir: "./squid"
+            container-image: "squid"
+            scan: "true"
 
     runs-on: ubuntu-22.04
     env:
-      go-version: "1.19"
+      go-version: "1.21"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup build environment
         uses: ./.github/actions/setup
         with:
@@ -68,6 +77,6 @@ jobs:
           yamory_token: ${{ secrets.YAMORY_ACCESS_TOKEN }}
           dir: ${{ matrix.job.dir }}
           container-image: ${{ matrix.job.container-image }}
-          enable_arm64:  ${{ matrix.job.enable_arm64 }}
+          enable_arm64: ${{ matrix.job.enable_arm64 }}
           make_test: ${{ matrix.job.make_test }}
           scan: ${{ matrix.job.scan }}

bird/BRANCH

@@ -1 +1 @@
-2.13
+2.14

bird/Dockerfile

@@ -1,9 +1,9 @@
 # BIRD container
 
 # Stage1: build from source
-FROM quay.io/cybozu/ubuntu-dev:20.04 AS build
+FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS build
 
-ARG BIRD_VERSION=2.13.1
+ARG BIRD_VERSION=2.14
 WORKDIR /work
 
 RUN apt-get update \
@@ -32,7 +32,8 @@ COPY bird-copyright /usr/local/bird/copyright
 
 
 # Stage2: setup runtime container
-FROM quay.io/cybozu/ubuntu:20.04
+FROM ghcr.io/cybozu/ubuntu:22.04
+LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"
 
 RUN apt-get update \
     && apt-get -y install --no-install-recommends \

bird/README.md

@@ -27,7 +27,7 @@ $ docker run -d --read-only --cap-drop ALL \
     --network host --name bird \
     --mount type=tmpfs,destination=/run/bird \
     --mount type=bind,source=/your/bird.conf,target=/etc/bird/bird.conf \
-    quay.io/cybozu/bird:2.13
+    quay.io/cybozu/bird:2.14
 ```
 
 ### Use client tools

bird/TAG

@@ -1 +1 @@
-2.13.1.1
+2.14.0.1

cert-manager/TAG

@@ -1 +1 @@
-1.13.2.1
+1.13.2.2

serf/Dockerfile

@@ -1,7 +1,7 @@
 # serf container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.21-jammy AS build
+FROM ghcr.io/cybozu/golang:1.21-jammy AS build
 
 ARG SERF_VERSION=0.10.1
 
@@ -15,7 +15,8 @@ WORKDIR /go/src/github.com/hashicorp/serf
 RUN go install -ldflags="-w -s" ./...
 
 # Stage2: setup runtime container
-FROM quay.io/cybozu/ubuntu:22.04
+FROM ghcr.io/cybozu/ubuntu:22.04
+LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"
 
 RUN apt-get update \
   && apt-get -y install --no-install-recommends \

serf/TAG

@@ -1 +1 @@
-0.10.1.3
+0.10.1.4

squid/Dockerfile

@@ -1,8 +1,8 @@
 # squid container
 
-FROM quay.io/cybozu/ubuntu-dev:22.04 as build
+FROM ghcr.io/cybozu/ubuntu-dev:22.04 as build
 
-ARG SQUID_VERSION=6.4
+ARG SQUID_VERSION=6.5
 
 WORKDIR /work
 # refer https://salsa.debian.org/squid-team/squid/-/blob/master/debian/rules
@@ -16,7 +16,8 @@ RUN curl -sfLO http://www.squid-cache.org/Versions/v6/squid-${SQUID_VERSION}.tar
     && make install
 
 # stage2: production image
-FROM quay.io/cybozu/ubuntu:22.04
+FROM ghcr.io/cybozu/ubuntu:22.04
+LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"
 
 COPY --from=build /usr/local/squid /usr/local/squid
 COPY --from=build /etc/squid /etc/squid

squid/TAG

@@ -1 +1 @@
-6.4.0.1
+6.5.0.1