update ubuntu version for devcontainer (#2736)

* ♻️ update ubuntu version for devcontainer Signed-off-by: vankichi <kyukawa315@gmail.com> * 💚 add platform opts Signed-off-by: vankichi <kyukawa315@gmail.com> * ♻️ Remove unnecessary installation Signed-off-by: vankichi <kyukawa315@gmail.com> * ♻️ Change install helm command Signed-off-by: vankichi <kyukawa315@gmail.com> * ♻️ Fix Signed-off-by: vankichi <kyukawa315@gmail.com> * ♻️ Fix Signed-off-by: vankichi <kyukawa315@gmail.com> * ♻️ Fix Signed-off-by: vankichi <kyukawa315@gmail.com> * 💚 remove platform opts Signed-off-by: vankichi <kyukawa315@gmail.com> --------- Signed-off-by: vankichi <kyukawa315@gmail.com> Co-authored-by: Yusuke Kato <kpango@vdaas.org>
vdaas · Nov 18, 2024 · 3d51a12 · 3d51a12
1 parent 246fb12
commit 3d51a12
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 22 deletions.
diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk
@@ -20,7 +20,12 @@ helm/install: $(BINDIR)/helm
 
 $(BINDIR)/helm:
 	mkdir -p $(BINDIR)
-	curl -fsSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | HELM_INSTALL_DIR=$(BINDIR) bash
+	$(eval DARCH := $(subst aarch64,arm64,$(ARCH)))
+	TAR_NAME=helm-$(HELM_VERSION)-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) \
+	    && cd $(TEMP_DIR) \
+	    && curl -fsSL "https://get.helm.sh/$${TAR_NAME}.tar.gz" -o "$(TEMP_DIR)/$${TAR_NAME}" \
+	    && tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" --strip=1 \
+	    && mv helm $(BINDIR)/helm
 
 .PHONY: helm-docs/install
 ## install helm-docs
@@ -32,7 +37,7 @@ $(BINDIR)/helm-docs:
 	TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(DARCH).tar.gz \
 	    && cd $(TEMP_DIR) \
 	    && curl -fsSL "https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/$${TAR_NAME}" -o "$(TEMP_DIR)/$${TAR_NAME}"\
-	    && tar xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
+	    && tar -xzvf "$(TEMP_DIR)/$${TAR_NAME}" \
 	    && mv helm-docs $(BINDIR)/helm-docs
 
 .PHONY: helm/package/vald

diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
@@ -19,7 +19,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 <vald@vdaas.org>"
 # skipcq: DOK-DL3002
 USER root:root
@@ -65,15 +65,10 @@ RUN --mount=type=bind,target=.,rw \
     && apt-get update -y \
     && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends --fix-missing \
-    curl \
-    gnupg \
-    software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test -y \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     ca-certificates \
+    curl \
+    gnupg \
     tzdata \
     locales \
     git \

diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go
@@ -93,20 +93,12 @@ RUN {{RunMounts .RunMounts}} \
     && apt-get clean \
     && apt-get update -y \
     && apt-get upgrade -y \
-{{- if eq (ContainerName .ContainerType) "%s"}}
-    && apt-get install -y --no-install-recommends --fix-missing \
-    curl \
-    gnupg \
-    software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test -y \
-    && apt-get update -y \
-    && apt-get upgrade -y \
-{{- end}}
     && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
     ca-certificates \
-{{- if not (eq (ContainerName .ContainerType) "%s")}}
     curl \
+{{- if eq (ContainerName .ContainerType) "%s"}}
+    gnupg \
 {{- end}}
     tzdata \
     locales \
@@ -144,7 +136,6 @@ ENTRYPOINT [{{Entrypoint .Entrypoints}}]
 ENTRYPOINT ["{{.BinDir}}/{{.AppName}}"]
 {{- end}}
 {{- end}}`, DevContainer.String(), CIContainer.String(),
-	DevContainer.String(),
 	DevContainer.String(),
 	DevContainer.String(), CIContainer.String(),
 	DevContainer.String(), CIContainer.String())
@@ -239,7 +230,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"