From ac484178c2f6b646f5d42b2b6fe0c66aaf71fec7 Mon Sep 17 00:00:00 2001 From: Taichi Takemura Date: Wed, 27 Nov 2024 17:10:59 +0900 Subject: [PATCH] Update kube-storage-version-migrator, registry, and vault (#1465) * Update kube-storage-version-migrator to 0.0.5.8 Signed-off-by: zeroalphat * Update registry to 2.8.3.5 Signed-off-by: zeroalphat * Update vault to 1.18.1 Signed-off-by: zeroalphat --------- Signed-off-by: zeroalphat --- kube-storage-version-migrator/Dockerfile | 2 +- kube-storage-version-migrator/TAG | 2 +- registry/Dockerfile | 4 ++-- registry/TAG | 2 +- vault/BRANCH | 2 +- vault/Dockerfile | 6 +++--- vault/README.md | 4 ++-- vault/TAG | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kube-storage-version-migrator/Dockerfile b/kube-storage-version-migrator/Dockerfile index 1f2091ee7..08ef470f8 100644 --- a/kube-storage-version-migrator/Dockerfile +++ b/kube-storage-version-migrator/Dockerfile @@ -6,7 +6,7 @@ # Each target is prefixed with "storage-version-migrate-" to construct its repository name. # Stage1: build from source -FROM ghcr.io/cybozu/golang:1.22-jammy AS build +FROM ghcr.io/cybozu/golang:1.23-noble AS build ARG MIGRATOR_VERSION=0.0.5 diff --git a/kube-storage-version-migrator/TAG b/kube-storage-version-migrator/TAG index e646cee13..17c74e9be 100644 --- a/kube-storage-version-migrator/TAG +++ b/kube-storage-version-migrator/TAG @@ -1 +1 @@ -0.0.5.7 +0.0.5.8 diff --git a/registry/Dockerfile b/registry/Dockerfile index a9ea2c0cf..d3564c476 100644 --- a/registry/Dockerfile +++ b/registry/Dockerfile @@ -1,7 +1,7 @@ # Registry container image # Stage1: build from source -FROM ghcr.io/cybozu/golang:1.22-jammy AS build +FROM ghcr.io/cybozu/golang:1.23-noble AS build ARG REGISTRY_VERSION=2.8.3 @@ -16,7 +16,7 @@ WORKDIR /go/src/github.com/docker/distribution/ RUN GO111MODULE=off CGO_ENABLED=0 make clean binaries VERSION=${REGISTRY_VERSION} REVISION="" # Stage2: setup runtime container -FROM ghcr.io/cybozu/ubuntu:22.04 +FROM ghcr.io/cybozu/ubuntu:24.04 LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers" RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/registry/TAG b/registry/TAG index 97cb876fd..58ae9b7d9 100644 --- a/registry/TAG +++ b/registry/TAG @@ -1 +1 @@ -2.8.3.4 +2.8.3.5 diff --git a/vault/BRANCH b/vault/BRANCH index b48f32260..adc97d8e2 100644 --- a/vault/BRANCH +++ b/vault/BRANCH @@ -1 +1 @@ -1.17 +1.18 diff --git a/vault/Dockerfile b/vault/Dockerfile index 46feb31e8..100eb16c8 100644 --- a/vault/Dockerfile +++ b/vault/Dockerfile @@ -1,9 +1,9 @@ # vault container # Stage1: build from source -FROM ghcr.io/cybozu/golang:1.22-jammy AS build +FROM ghcr.io/cybozu/golang:1.23-noble AS build -ARG VAULT_VERSION=1.17.5 +ARG VAULT_VERSION=1.18.1 RUN git clone --depth=1 -b v${VAULT_VERSION} https://github.com/hashicorp/vault.git @@ -14,7 +14,7 @@ RUN make bootstrap && \ make # Stage2: setup runtime container -FROM ghcr.io/cybozu/ubuntu:22.04 +FROM ghcr.io/cybozu/ubuntu:24.04 LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers" COPY --from=build /work/vault/bin /usr/local/vault/bin diff --git a/vault/README.md b/vault/README.md index ef929d1d8..d0eeb04ad 100644 --- a/vault/README.md +++ b/vault/README.md @@ -24,7 +24,7 @@ To launch vault server by `docker run`: --ulimit memlock=-1 \ -v /your/config.hcl:/vault/config/config.hcl:ro \ -p 8200:8200 -p 8201:8201 \ - ghcr.io/cybozu/vault:1.17 \ + ghcr.io/cybozu/vault:1.18 \ server -config=/vault/config/config.hcl To use vault cli, first install it in a host OS directory `DIR`: @@ -32,7 +32,7 @@ To use vault cli, first install it in a host OS directory `DIR`: $ docker run --rm -u root:root \ --entrypoint /usr/local/vault/install-tools \ -v DIR:/host \ - ghcr.io/cybozu/vault:1.17 + ghcr.io/cybozu/vault:1.18 Then run `vault` as follows: diff --git a/vault/TAG b/vault/TAG index 027676036..adb400846 100644 --- a/vault/TAG +++ b/vault/TAG @@ -1 +1 @@ -1.17.5.1 +1.18.1.1