Merge pull request #1065 from cybozu/network-regular-update

Update bird, cert-manager, and chrony

.circleci/config.yml

@@ -575,7 +575,7 @@ jobs:
       version:
         type: string
     docker:
-      - image: quay.io/cybozu/golang:1.19-focal
+      - image: quay.io/cybozu/golang:1.20-jammy
     resource_class: xlarge
     steps:
       - checkout
@@ -710,7 +710,7 @@ workflows:
       - build-cert-manager:
           #repo: https://github.com/cert-manager/cert-manager
           repo: https://github.com/cybozu-go/cert-manager
-          version: 1.10.2-neco-longtimeout.1
+          version: 1.11.4-neco-longtimeout.1
       - build:
           name: build-cert-manager-container
           container-image: cert-manager

bird/BRANCH

@@ -1 +1 @@
-2.0
+2.13

bird/Dockerfile

@@ -3,7 +3,7 @@
 # Stage1: build from source
 FROM quay.io/cybozu/ubuntu-dev:20.04 AS build
 
-ARG BIRD_VERSION=2.0.12
+ARG BIRD_VERSION=2.13.1
 WORKDIR /work
 
 RUN apt-get update \

bird/README.md

@@ -7,7 +7,7 @@ that runs up-to-date [BIRD][] internet routing daemon.
 Features
 --------
 
-* BIRD 2.0
+* BIRD 2.x
 * Multi-stage build to minimize the container size.
 * Optimized for BGP.  RIP, OSPF, Babel, and RAdv are not built-in.
 
@@ -27,21 +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.0
-```
-
-For rkt:
-```
-sudo rkt run \
-    --volume run,kind=empty,readOnly=false \
-    --volume etc,kind=host,source=/your/bird.conf,readOnly=true \
-    --net=host \
-    quay.io/cybozu/bird:2.0 \
-        --readonly-rootfs=true \
-        --caps-retain=CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_NET_RAW \
-        --name bird \
-        --mount volume=run,target=/run/bird \
-        --mount volume=etc,target=/etc/bird/bird.conf
+    quay.io/cybozu/bird:2.13
 ```
 
 ### Use client tools

bird/TAG

@@ -1 +1 @@
-2.0.12.1
+2.13.1.1

cert-manager/BRANCH

@@ -1 +1 @@
-1.10
+1.11

cert-manager/Dockerfile

@@ -1,6 +1,6 @@
 # cert-manager container
 
-FROM quay.io/cybozu/ubuntu:20.04
+FROM quay.io/cybozu/ubuntu:22.04
 
 COPY workspace/webhook /usr/local/bin/webhook
 COPY workspace/cainjector /usr/local/bin/cainjector

cert-manager/README.md

@@ -13,7 +13,7 @@ Run the container
 
 ```console
 $ docker run -d --read-only --name=cert-manager-controller \
-    quay.io/cybozu/cert-manager:1.10 controller
+    quay.io/cybozu/cert-manager:1.11 controller
 ```
 
 License

cert-manager/TAG

@@ -1 +1 @@
-1.10.2.1
+1.11.4.1

chrony/Dockerfile

@@ -1,7 +1,7 @@
 # chrony container
 
 # Stage1: build from source
-FROM quay.io/cybozu/ubuntu-dev:20.04 AS build
+FROM quay.io/cybozu/ubuntu-dev:22.04 AS build
 ARG CHRONY_VERSION=4.3
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -20,7 +20,7 @@ RUN ./configure --exec-prefix=/usr/local/chrony --with-pidfile=/run/chrony/chron
 
 
 # Stage2: setup runtime container
-FROM quay.io/cybozu/ubuntu:20.04
+FROM quay.io/cybozu/ubuntu:22.04
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends libedit2 \

chrony/README.md

@@ -6,7 +6,7 @@ Build Docker container image for [Chrony][] NTP server/client.
 Features
 --------
 
-- Chrony 4.3 based on Ubuntu 20.04.
+- Chrony 4.3 based on Ubuntu 22.04.
 - Multi-stage build to minimize the container size.
 
 Usage

chrony/TAG

@@ -1 +1 @@
-4.3.0.2
+4.3.0.3