Skip to content

Commit 33ebaad

Browse files
kmontgkmontg
committed
chore: move images to ubuntu 24
I'm also removing the docker/cli image, as we will push images using a go binary instead of a CLI image. Change-Id: I2332f0afa47838af4bb7f7094bfec24a9ff6c692
1 parent 943ae7d commit 33ebaad

File tree

28 files changed

+112
-263
lines changed

28 files changed

+112
-263
lines changed

Diff for: ‎cloudbuild.yaml

+30-35
Original file line numberDiff line numberDiff line change
@@ -55,56 +55,51 @@ steps:
5555
- build
5656
args:
5757
- "--on_demand"
58-
# Base Images
59-
- "--image=${_IMAGE_REGISTRY}/gcb-base:ubuntu22"
60-
# Tool Images
61-
- "--image=${_IMAGE_REGISTRY}/docker/dind:debian12"
62-
- "--image=${_IMAGE_REGISTRY}/docker/cli:debian12"
63-
- "--image=${_IMAGE_REGISTRY}/gar-upload:ubuntu22"
64-
- "--image=${_IMAGE_REGISTRY}/git-steps:ubuntu22"
65-
- "--image=${_IMAGE_REGISTRY}/app-engine:ubuntu22"
66-
- "--image=${_IMAGE_REGISTRY}/cloud-deploy:ubuntu22"
67-
- "--image=${_IMAGE_REGISTRY}/cloud-storage:ubuntu22"
68-
- "--image=${_IMAGE_REGISTRY}/cloud-run:ubuntu22"
69-
- "--image=${_IMAGE_REGISTRY}/cloud-function:ubuntu22"
70-
- "--image=${_IMAGE_REGISTRY}/gke-deploy:ubuntu22"
71-
- "--image=${_IMAGE_REGISTRY}/builder:debian12"
72-
- "--image=${_IMAGE_REGISTRY}/go:ubuntu22"
73-
- "--image=${_IMAGE_REGISTRY}/nodejs-steps:ubuntu22"
74-
- "--image=${_IMAGE_REGISTRY}/python-steps:ubuntu22"
75-
- "--image=${_IMAGE_REGISTRY}/maven-steps:ubuntu22"
58+
- "--image=${_IMAGE_REGISTRY}/gcb-base:ubuntu24"
59+
- "--image=${_IMAGE_REGISTRY}/docker/dind:ubuntu24"
60+
- "--image=${_IMAGE_REGISTRY}/gar-upload:ubuntu24"
61+
- "--image=${_IMAGE_REGISTRY}/git-steps:ubuntu24"
62+
- "--image=${_IMAGE_REGISTRY}/app-engine:ubuntu24"
63+
- "--image=${_IMAGE_REGISTRY}/cloud-deploy:ubuntu24"
64+
- "--image=${_IMAGE_REGISTRY}/cloud-storage:ubuntu24"
65+
- "--image=${_IMAGE_REGISTRY}/cloud-run:ubuntu24"
66+
- "--image=${_IMAGE_REGISTRY}/cloud-function:ubuntu24"
67+
- "--image=${_IMAGE_REGISTRY}/gke-deploy:ubuntu24"
68+
- "--image=${_IMAGE_REGISTRY}/builder:ubuntu24"
69+
- "--image=${_IMAGE_REGISTRY}/go:ubuntu24"
70+
- "--image=${_IMAGE_REGISTRY}/nodejs-steps:ubuntu24"
71+
- "--image=${_IMAGE_REGISTRY}/python-steps:ubuntu24"
72+
- "--image=${_IMAGE_REGISTRY}/maven-steps:ubuntu24"
7673

7774
# Push the images.
7875
images:
7976
- ${_IMAGE_REGISTRY}/gcb-base:latest
80-
- ${_IMAGE_REGISTRY}/gcb-base:ubuntu22
77+
- ${_IMAGE_REGISTRY}/gcb-base:ubuntu24
8178
- ${_IMAGE_REGISTRY}/docker/dind:latest
82-
- ${_IMAGE_REGISTRY}/docker/dind:debian12
83-
- ${_IMAGE_REGISTRY}/docker/cli:latest
84-
- ${_IMAGE_REGISTRY}/docker/cli:debian12
79+
- ${_IMAGE_REGISTRY}/docker/dind:ubuntu24
8580
- ${_IMAGE_REGISTRY}/gar-upload:latest
86-
- ${_IMAGE_REGISTRY}/gar-upload:ubuntu22
81+
- ${_IMAGE_REGISTRY}/gar-upload:ubuntu24
8782
- ${_IMAGE_REGISTRY}/git-steps:latest
88-
- ${_IMAGE_REGISTRY}/git-steps:ubuntu22
83+
- ${_IMAGE_REGISTRY}/git-steps:ubuntu24
8984
- ${_IMAGE_REGISTRY}/app-engine:latest
90-
- ${_IMAGE_REGISTRY}/app-engine:ubuntu22
85+
- ${_IMAGE_REGISTRY}/app-engine:ubuntu24
9186
- ${_IMAGE_REGISTRY}/cloud-deploy:latest
92-
- ${_IMAGE_REGISTRY}/cloud-deploy:ubuntu22
87+
- ${_IMAGE_REGISTRY}/cloud-deploy:ubuntu24
9388
- ${_IMAGE_REGISTRY}/cloud-storage:latest
94-
- ${_IMAGE_REGISTRY}/cloud-storage:ubuntu22
89+
- ${_IMAGE_REGISTRY}/cloud-storage:ubuntu24
9590
- ${_IMAGE_REGISTRY}/cloud-run:latest
96-
- ${_IMAGE_REGISTRY}/cloud-run:ubuntu22
91+
- ${_IMAGE_REGISTRY}/cloud-run:ubuntu24
9792
- ${_IMAGE_REGISTRY}/cloud-function:latest
98-
- ${_IMAGE_REGISTRY}/cloud-function:ubuntu22
93+
- ${_IMAGE_REGISTRY}/cloud-function:ubuntu24
9994
- ${_IMAGE_REGISTRY}/gke-deploy:latest
100-
- ${_IMAGE_REGISTRY}/gke-deploy:ubuntu22
95+
- ${_IMAGE_REGISTRY}/gke-deploy:ubuntu24
10196
- ${_IMAGE_REGISTRY}/builder:latest
102-
- ${_IMAGE_REGISTRY}/builder:debian12
97+
- ${_IMAGE_REGISTRY}/builder:ubuntu24
10398
- ${_IMAGE_REGISTRY}/go:latest
104-
- ${_IMAGE_REGISTRY}/go:ubuntu22
99+
- ${_IMAGE_REGISTRY}/go:ubuntu24
105100
- ${_IMAGE_REGISTRY}/nodejs-steps:latest
106-
- ${_IMAGE_REGISTRY}/nodejs-steps:ubuntu22
101+
- ${_IMAGE_REGISTRY}/nodejs-steps:ubuntu24
107102
- ${_IMAGE_REGISTRY}/python-steps:latest
108-
- ${_IMAGE_REGISTRY}/python-steps:ubuntu22
103+
- ${_IMAGE_REGISTRY}/python-steps:ubuntu24
109104
- ${_IMAGE_REGISTRY}/maven-steps:latest
110-
- ${_IMAGE_REGISTRY}/maven-steps:ubuntu22
105+
- ${_IMAGE_REGISTRY}/maven-steps:ubuntu24

Diff for: ‎cmd/app-engine/test/test_dir/app.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# Copyright 2019 Google LLC
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# https://www.apache.org/licenses/LICENSE-2.0
8-
#
91
# Unless required by applicable law or agreed to in writing, software
102
# distributed under the License is distributed on an "AS IS" BASIS,
113
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Diff for: ‎images/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33
SUBDIRS = base app-engine cloud-deploy cloud-storage cloud-run cloud-function docker gar-upload git-steps gke-deploy go nodejs-steps maven-steps python-steps builder
44

55
build:

Diff for: ‎images/app-engine/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building app-engine image"

Diff for: ‎images/base/Dockerfile

+14-18
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# limitations under the License.
1616
#
1717

18-
# Adopted from https://github.com/kubernetes/release/blob/master/images/build/debian-base/bullseye/Dockerfile.build
18+
# Adopted from https://github.com/kubernetes/release/blob/master/images/build/debian-base/bookworm/Dockerfile.build
1919
# hadolint ignore=DL3007
20-
FROM gcr.io/cloud-marketplace/google/ubuntu2204:latest
20+
FROM marketplace.gcr.io/google/ubuntu2404:latest
2121

2222
ENV DEBIAN_FRONTEND=noninteractive
2323

@@ -32,6 +32,18 @@ RUN apt-get update && \
3232
apt-get upgrade -y && \
3333
rm -rf /var/lib/apt/lists/*
3434

35+
# Remove unnecessary packages.
36+
RUN dpkg --purge --force-remove-essential \
37+
e2fsprogs \
38+
libss2 \
39+
libcom-err2 \
40+
libext2fs2 \
41+
logsave \
42+
ncurses-base \
43+
ncurses-bin \
44+
tzdata \
45+
&& apt-get autoremove --purge -y
46+
3547
# No-op stubs replace some unnecessary binaries that may be depended on in the install process (in
3648
# particular we don't run an init process).
3749
WORKDIR /usr/local/bin
@@ -40,21 +52,8 @@ RUN touch noop && \
4052
ln -s noop runlevel && \
4153
ln -s noop invoke-rc.d && \
4254
ln -s noop update-rc.d
43-
4455
WORKDIR /
4556

46-
# Hold required packages to avoid breaking the installation of packages
47-
RUN apt-mark hold apt gpgv adduser passwd libsemanage-common libsemanage2 libcap2 && \
48-
apt-get purge -y --allow-remove-essential \
49-
e2fsprogs \
50-
libmount1 \
51-
libsmartcols1 \
52-
libblkid1 \
53-
libss2 \
54-
ncurses-base \
55-
ncurses-bin \
56-
util-linux
57-
5857
# Install common packages needed by CICD processes.
5958
RUN clean-install \
6059
apt-transport-https \
@@ -68,12 +67,9 @@ RUN clean-install \
6867
unzip
6968

7069
# Cleanup cached and unnecessary files.
71-
# Keep copyright notices and licenses available under /usr/share/copyrights.tar.gz.
7270
RUN apt-get autoremove -y && \
7371
apt-get clean -y && \
74-
tar -czf /usr/share/copyrights.tar.gz /usr/share/common-licenses /usr/share/doc/*/copyright && \
7572
rm -rf \
76-
/usr/share/doc \
7773
/usr/share/man \
7874
/usr/share/info \
7975
/usr/share/locale \

Diff for: ‎images/base/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building base image"

Diff for: ‎images/base/excludes

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ path-exclude /usr/share/info/*
77
path-exclude /usr/share/locale/*
88
path-include /usr/share/locale/en_US*
99
path-include /usr/share/locale/locale.alias
10-
path-exclude /usr/share/man/*
10+
path-exclude /usr/share/man/*

Diff for: ‎images/builder/Dockerfile

+8-15
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,22 @@
1616
#
1717

1818
#hadolint ignore=DL3006
19-
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:stable-alpha
19+
FROM base
2020

2121
USER root
2222
ENV USER=root \
2323
ENV=/etc/environment \
24-
HOME=/root \
25-
DEBIAN_FRONTEND=noninteractive
26-
27-
#hadolint ignore=DL3008
28-
RUN <<EOF
29-
apt-get update
30-
apt-get upgrade -y
31-
apt-get install -y --no-install-recommends \
32-
yq gnupg curl ca-certificates \
33-
software-properties-common
34-
apt-get clean
35-
rm -rf /var/lib/apt/lists/*
36-
EOF
24+
HOME=/root
3725

3826
# Convenience script for building on this base image.
39-
COPY clean-install /usr/local/bin/clean-install
4027
COPY installer-scripts/ /opt/installer-scripts/
4128

29+
RUN <<EOF
30+
clean-install \
31+
software-properties-common \
32+
yq
33+
EOF
34+
4235
#hadolint ignore=DL3059
4336
SHELL ["/bin/bash", "-c"]
4437
RUN <<EOF

Diff for: ‎images/builder/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= debian12
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building generic builder image"

Diff for: ‎images/builder/clean-install

-34
This file was deleted.

Diff for: ‎images/builder/installer-scripts/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ nothing to build"

Diff for: ‎images/builder/installer-scripts/docker.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ DOCKER_COMPOSE_VERSION=$(yq '."build-tools"."docker-compose".version' $PACKAGES)
3131

3232
install -m 0755 -d /etc/apt/keyrings;
3333
DOCKER_GPG_KEY=/etc/apt/keyrings/docker.gpg
34-
DOCKER_GPG_KEY_URL="https://download.docker.com/linux/debian/gpg"
34+
DOCKER_GPG_KEY_URL="https://download.docker.com/linux/ubuntu/gpg"
3535
curl -fsSL $DOCKER_GPG_KEY_URL | gpg --dearmor -o $DOCKER_GPG_KEY
3636

3737
ARCH=$(dpkg --print-architecture)
38-
DOCKER_APT_URL="https://download.docker.com/linux/debian"
38+
DOCKER_APT_URL="https://download.docker.com/linux/ubuntu"
3939
echo -e \
4040
"# Add the docker repository to Apt sources:\n" \
4141
"deb [arch=$ARCH signed-by=$DOCKER_GPG_KEY] $DOCKER_APT_URL \
@@ -53,7 +53,4 @@ docker --version
5353
docker-compose version
5454
docker-buildx version
5555

56-
## Configure AR/GCR credentials helper
57-
gcloud auth configure-docker -q --include-artifact-registry
58-
5956

Diff for: ‎images/cloud-deploy/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building cloud-deploy image"

Diff for: ‎images/cloud-function/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building cloud-function image"

Diff for: ‎images/cloud-run/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building cloud-run image"

Diff for: ‎images/cloud-storage/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REGISTRY ?= us-docker.pkg.dev/gcb-catalog-release/catalog
2-
TAG ?= ubuntu22
2+
TAG ?= ubuntu24
33

44
build:
55
@echo "+ building cloud-storage image"

Diff for: ‎images/docker-bake.hcl

+15-21
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ variable "REGISTRY" {
22
default = "us-docker.pkg.dev/gcb-catalog-release/catalog"
33
}
44
variable "TAG" {
5-
default = "ubuntu22"
5+
default = "ubuntu24"
66
}
77

88
group "default" {
99
targets = [
1010
"base",
1111
"app-engine",
12-
"docker-cli",
1312
"docker-dind",
1413
"gar-upload",
1514
"git-steps",
@@ -35,20 +34,27 @@ target "base" {
3534
]
3635
}
3736

38-
target "docker-cli" {
39-
dockerfile = "Dockerfile.cli"
40-
context = "docker"
37+
target "builder" {
38+
dockerfile = "Dockerfile"
39+
context = "builder"
40+
contexts = {
41+
base = "target:base"
42+
src = "../"
43+
}
4144
tags = [
42-
"${REGISTRY}/docker/cli:debian12",
43-
"${REGISTRY}/docker/cli:latest",
45+
"${REGISTRY}/builder:${TAG}",
46+
"${REGISTRY}/builder:latest"
4447
]
4548
}
4649

4750
target "docker-dind" {
48-
dockerfile = "Dockerfile.dind"
51+
dockerfile = "Dockerfile"
4952
context = "docker"
53+
contexts = {
54+
base = "target:base"
55+
}
5056
tags = [
51-
"${REGISTRY}/docker/dind:debian12",
57+
"${REGISTRY}/docker/dind:${TAG}",
5258
"${REGISTRY}/docker/dind:latest"
5359
]
5460
}
@@ -217,15 +223,3 @@ target "python-steps" {
217223
"${REGISTRY}/python-steps:latest"
218224
]
219225
}
220-
221-
target "builder" {
222-
dockerfile = "Dockerfile"
223-
context = "builder"
224-
contexts = {
225-
src = "../"
226-
}
227-
tags = [
228-
"${REGISTRY}/builder:debian12",
229-
"${REGISTRY}/builder:latest"
230-
]
231-
}

0 commit comments

Comments
 (0)