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.

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

feat(deps): update ubuntu docker tag to v24 #38

Merged
merged 4 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions gcloud-workstation-phpstorm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://console.cloud.google.com/artifacts/docker/cloud-workstations-images/us-central1/predefined/phpstorm
FROM europe-west3-docker.pkg.dev/cloud-workstations-images/predefined/phpstorm:latest@sha256:d8228cf4afc9979ef1508b18c4ef33eec5f71f4b8452076326edb148d40216b8 as base

FROM ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97
FROM ubuntu:24.04@sha256:99c35190e22d294cdace2783ac55effc69d32896daaa265f0bbedbcde4fbe3e5

# we use the /home directory in a persistent way
VOLUME ["/home/"]
Expand Down Expand Up @@ -41,7 +41,6 @@ RUN apt update && apt install -y \
docker-buildx-plugin \
docker-compose-plugin \
gettext-base \
golang-go \
google-cloud-cli \
go-task \
htop \
Expand All @@ -56,10 +55,14 @@ RUN apt update && apt install -y \
software-properties-common \
sops \
vim \
yq \
zsh \
zsh-autosuggestions \
zsh-syntax-highlighting

# install latest go-lang stable
RUN export latest=$(curl -s "https://go.dev/VERSION?m=text" | head -n 1) && wget https://go.dev/dl/$latest.linux-amd64.tar.gz && tar -C /usr/local -xzf $latest.linux-amd64.tar.gz && ln -s /usr/local/go/bin/go /usr/bin/go

# infra
RUN apt install -y \
flux \
Expand Down
7 changes: 5 additions & 2 deletions gcloud-workstation-vscode/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://console.cloud.google.com/artifacts/docker/cloud-workstations-images/us-central1/predefined/code-oss
FROM europe-west3-docker.pkg.dev/cloud-workstations-images/predefined/code-oss:latest@sha256:58879a6b68d51b08c79657a40f54aae254874418c487b2be6691efc174d20277 as base

FROM ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97
FROM ubuntu:24.04@sha256:99c35190e22d294cdace2783ac55effc69d32896daaa265f0bbedbcde4fbe3e5

# we use the /home directory in a persistent way
VOLUME ["/home/"]
Expand Down Expand Up @@ -42,7 +42,6 @@ RUN apt update && apt install -y \
docker-buildx-plugin \
docker-compose-plugin \
gettext-base \
golang-go \
google-cloud-cli \
go-task \
gpg \
Expand All @@ -58,10 +57,14 @@ RUN apt update && apt install -y \
software-properties-common \
sops \
vim \
yq \
zsh \
zsh-autosuggestions \
zsh-syntax-highlighting

# install latest go-lang stable
RUN export latest=$(curl -s "https://go.dev/VERSION?m=text" | head -n 1) && wget https://go.dev/dl/$latest.linux-amd64.tar.gz && tar -C /usr/local -xzf $latest.linux-amd64.tar.gz && ln -s /usr/local/go/bin/go /usr/bin/go

# infra
RUN apt install -y \
flux \
Expand Down
Loading