From 6b594377f75afba843f521fc35eb6666ba155d71 Mon Sep 17 00:00:00 2001 From: vankichi Date: Sat, 9 Nov 2024 01:23:25 +0900 Subject: [PATCH] :recycle: update ubuntu version for devcontainer Signed-off-by: vankichi --- dockers/dev/Dockerfile | 2 +- dockers/index/job/deletion/Dockerfile | 3 ++- hack/docker/gen/main.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 3e80596341..f1f0464a0a 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -18,7 +18,7 @@ # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go ARG UPX_OPTIONS=-9 # skipcq: DOK-DL3026,DOK-DL3007 -FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04 +FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04 LABEL maintainer="vdaas.org vald team " # skipcq: DOK-DL3002 USER root:root diff --git a/dockers/index/job/deletion/Dockerfile b/dockers/index/job/deletion/Dockerfile index cd1d29eac8..323965dfcd 100644 --- a/dockers/index/job/deletion/Dockerfile +++ b/dockers/index/job/deletion/Dockerfile @@ -82,6 +82,7 @@ RUN --mount=type=bind,target=.,rw \ FROM gcr.io/distroless/static:nonroot LABEL maintainer="vdaas.org vald team " COPY --from=builder /usr/bin/index-deletion /usr/bin/index-deletion +COPY cmd/index/job/deletion/sample.yaml /etc/server/config.yaml # skipcq: DOK-DL3002 USER nonroot:nonroot -ENTRYPOINT ["/usr/bin/index-deletion"] +ENTRYPOINT ["/usr/bin/index-deletion"] \ No newline at end of file diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go index 2e3487a779..c619fdc35c 100644 --- a/hack/docker/gen/main.go +++ b/hack/docker/gen/main.go @@ -238,7 +238,7 @@ const ( defaultBuildStageName = "builder" maintainerKey = "MAINTAINER" minimumArgumentLength = 2 - ubuntuVersion = "22.04" + ubuntuVersion = "24.04" goWorkdir = "${GOPATH}/src/github.com" rustWorkdir = "${HOME}/rust/src/github.com"