Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update ubuntu version for devcontainer #2736

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

update ubuntu version for devcontainer #2736

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b59437
:recycle: update ubuntu version for devcontainer
vankichi Nov 8, 2024
699a180
:green_heart: add platform opts
vankichi Nov 8, 2024
f55b80c
:recycle: Remove unnecessary installation
vankichi Nov 11, 2024
460e972
:recycle: Change install helm command
vankichi Nov 13, 2024
a31e43c
:recycle: Fix
vankichi Nov 13, 2024
5b3359b
:recycle: Fix
vankichi Nov 13, 2024
72b063d
:recycle: Fix
vankichi Nov 13, 2024
03f5177
Merge branch 'main' into refactor/hack-dockers/update-ubuntu-version-…
kpango Nov 13, 2024
415e4af
:green_heart: remove platform opts
vankichi Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/dockers-dev-container-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ jobs:
uses: ./.github/workflows/_docker-image.yaml
with:
target: dev-container
platforms: "linux/amd64,linux/arm64"
secrets: inherit
7 changes: 6 additions & 1 deletion Makefile.d/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 --strip=1 "$(TEMP_DIR)/$${TAR_NAME}" \
&& mv helm $(BINDIR)/helm

.PHONY: helm-docs/install
## install helm-docs
Expand Down
11 changes: 3 additions & 8 deletions dockers/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
kpango marked this conversation as resolved.
Show resolved Hide resolved
LABEL maintainer="vdaas.org vald team <[email protected]>"
# skipcq: DOK-DL3002
USER root:root
Expand Down Expand Up @@ -64,15 +64,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 \
Expand Down
3 changes: 2 additions & 1 deletion dockers/index/job/deletion/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ RUN --mount=type=bind,target=.,rw \
FROM gcr.io/distroless/static:nonroot
LABEL maintainer="vdaas.org vald team <[email protected]>"
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"]
15 changes: 3 additions & 12 deletions hack/docker/gen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,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 \
Expand Down Expand Up @@ -143,7 +135,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())
Expand Down Expand Up @@ -238,7 +229,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"
Expand Down
Loading