Skip to content

Commit 1bf8d24

Browse files
authored
Merge pull request #35799 from upodroid/enable-dependabot
enable dependabot bumping of docker images
2 parents e97504c + b0b3a5d commit 1bf8d24

File tree

8 files changed

+75
-67
lines changed

8 files changed

+75
-67
lines changed

.github/dependabot.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "docker"
4+
directory: "/images/"
5+
schedule:
6+
interval: "daily"
7+
labels:
8+
- "skip-review"

images/bigquery/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ubuntu:22.04
15+
FROM ubuntu:jammy-20251001
1616

1717
RUN apt-get update && apt-get install -y \
1818
git \

images/bootstrap/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Includes basic workspace setup, with gcloud and a bootstrap runner
1616

17-
FROM debian:bookworm
17+
FROM debian:bookworm-20251020
1818

1919
WORKDIR /workspace
2020
RUN mkdir -p /workspace
@@ -65,10 +65,10 @@ RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
6565
tar xzf google-cloud-sdk.tar.gz -C / && \
6666
rm google-cloud-sdk.tar.gz && \
6767
/google-cloud-sdk/install.sh \
68-
--disable-installation-options \
69-
--bash-completion=false \
70-
--path-update=false \
71-
--usage-reporting=false && \
68+
--disable-installation-options \
69+
--bash-completion=false \
70+
--path-update=false \
71+
--usage-reporting=false && \
7272
gcloud components install alpha beta kubectl && \
7373
gcloud info | tee /workspace/gcloud-info.txt
7474

@@ -127,7 +127,7 @@ RUN mkdir /docker-graph
127127
# env DOCKER_IN_DOCKER_ENABLED is set and similarly responsible for generating
128128
# .bazelrc files if bazel remote caching is enabled
129129
COPY ["entrypoint.sh", "runner.sh", \
130-
"/usr/local/bin/"]
130+
"/usr/local/bin/"]
131131

132132
# TODO(krzyzacy): Move the scenario scripts to kubekins v2
133133
# The bundled scenarios are for podutil jobs, bootstrap jobs will still use

images/builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM google/cloud-sdk:alpine
15+
FROM google/cloud-sdk:545.0.0-alpine
1616
COPY builder run.sh /
1717
CMD ["/run.sh"]

images/git-custom-k8s-auth/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM google/cloud-sdk:491.0.0 as builder
15+
FROM google/cloud-sdk:545.0.0 as builder
1616
# https://github.com/GoogleCloudPlatform/cloud-sdk-docker/blob/master/Dockerfile
1717

1818
ARG AWS_IAM_AUTHENTICATOR_VERSION
@@ -23,14 +23,14 @@ RUN curl -fsSL \
2323
chmod +x /aws-iam-authenticator
2424

2525
RUN apt update && apt install -y unzip && curl -fsSLO https://github.com/Azure/kubelogin/releases/download/v${AZURE_KUBELOGIN_VERSION}/kubelogin-linux-amd64.zip \
26-
&& unzip -j kubelogin-linux-amd64.zip -d / \
27-
&& rm kubelogin-linux-amd64.zip
26+
&& unzip -j kubelogin-linux-amd64.zip -d / \
27+
&& rm kubelogin-linux-amd64.zip
2828

2929
# Update the date below (check https://hub.docker.com/_/alpine/tags) to get the
3030
# alpine edge base image, which has a faster release cadence than alpine:latest
3131
# (which tracks alpine stable), to pick up security patches more quickly.
3232
# TODO: switch to Distroless https://github.com/GoogleContainerTools/distroless (help-wanted)
33-
FROM alpine:20240606
33+
FROM alpine:3.22.2
3434

3535
ARG IMAGE_ARG
3636
ENV IMAGE=${IMAGE_ARG}

images/git/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Update the date below (check https://hub.docker.com/_/alpine/tags) to get the
1616
# alpine edge base image, which has a faster release cadence than alpine:latest
1717
# (which tracks alpine stable), to pick up security patches more quickly.
18-
FROM alpine:20240606
18+
FROM alpine:3.22.2
1919

2020
ARG IMAGE_ARG
2121
ENV IMAGE=${IMAGE_ARG}

images/krte/Dockerfile

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# NOTE: we attempt to avoid unnecessary tools and image layers while
1717
# supporting kubernetes builds, kind installation, etc.
1818

19-
FROM debian:bookworm
19+
FROM debian:bookworm-20251020
2020

2121
# arg that specifies the image name (for debugging)
2222
ARG IMAGE_ARG
@@ -51,57 +51,57 @@ COPY wrapper.sh /usr/local/bin/
5151
# Trying to remount these makes for a very noisy error block in the beginning of
5252
# the pod logs, so we just comment out the call to it... :shrug:
5353
RUN echo "Installing Packages ..." \
54-
&& apt-get update \
55-
&& apt-get install -y --no-install-recommends \
56-
apt-transport-https \
57-
build-essential \
58-
ca-certificates \
59-
curl \
60-
file \
61-
git \
62-
gnupg2 \
63-
iproute2 \
64-
kmod \
65-
lsb-release \
66-
mercurial \
67-
pkg-config \
68-
procps \
69-
python3 \
70-
rsync \
71-
software-properties-common \
72-
unzip \
73-
&& rm -rf /var/lib/apt/lists/* \
54+
&& apt-get update \
55+
&& apt-get install -y --no-install-recommends \
56+
apt-transport-https \
57+
build-essential \
58+
ca-certificates \
59+
curl \
60+
file \
61+
git \
62+
gnupg2 \
63+
iproute2 \
64+
kmod \
65+
lsb-release \
66+
mercurial \
67+
pkg-config \
68+
procps \
69+
python3 \
70+
rsync \
71+
software-properties-common \
72+
unzip \
73+
&& rm -rf /var/lib/apt/lists/* \
7474
&& echo "Installing Go ..." \
75-
&& if [ -z "${GO_VERSION}" ]; then GO_VERSION=$(curl -fsSL https://go.dev/VERSION?m=text | grep -oP "go\K(.*)"); fi \
76-
&& export GO_TARBALL="go${GO_VERSION}.linux-amd64.tar.gz" \
77-
&& curl -fsSL "https://go.dev/dl/${GO_TARBALL}" --output "${GO_TARBALL}" \
78-
&& tar xzf "${GO_TARBALL}" -C /usr/local \
79-
&& rm "${GO_TARBALL}"\
80-
&& mkdir -p "${GOPATH}/bin" \
75+
&& if [ -z "${GO_VERSION}" ]; then GO_VERSION=$(curl -fsSL https://go.dev/VERSION?m=text | grep -oP "go\K(.*)"); fi \
76+
&& export GO_TARBALL="go${GO_VERSION}.linux-amd64.tar.gz" \
77+
&& curl -fsSL "https://go.dev/dl/${GO_TARBALL}" --output "${GO_TARBALL}" \
78+
&& tar xzf "${GO_TARBALL}" -C /usr/local \
79+
&& rm "${GO_TARBALL}"\
80+
&& mkdir -p "${GOPATH}/bin" \
8181
&& echo "Installing gcloud SDK, kubectl ..." \
82-
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output google-cloud-sdk.tar.gz \
83-
&& tar xzf google-cloud-sdk.tar.gz -C / \
84-
&& rm google-cloud-sdk.tar.gz \
85-
&& /google-cloud-sdk/install.sh \
86-
--disable-installation-options \
87-
--bash-completion=false \
88-
--path-update=false \
89-
--usage-reporting=false \
90-
&& gcloud components install kubectl \
82+
&& curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output google-cloud-sdk.tar.gz \
83+
&& tar xzf google-cloud-sdk.tar.gz -C / \
84+
&& rm google-cloud-sdk.tar.gz \
85+
&& /google-cloud-sdk/install.sh \
86+
--disable-installation-options \
87+
--bash-completion=false \
88+
--path-update=false \
89+
--usage-reporting=false \
90+
&& gcloud components install kubectl \
9191
&& echo "Installing Docker ..." \
92-
&& curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
93-
&& chmod a+r /etc/apt/keyrings/docker.gpg \
94-
&& echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
95-
"$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
96-
tee /etc/apt/sources.list.d/docker.list > /dev/null \
97-
&& apt-get update \
98-
&& apt-get install -y --no-install-recommends docker-ce docker-buildx-plugin \
99-
&& rm -rf /var/lib/apt/lists/* \
100-
&& sed -i 's/cgroupfs_mount$/#cgroupfs_mount\n/' /etc/init.d/docker \
101-
&& sed -i 's/ulimit -Hn/# ulimit -Hn/g' /etc/init.d/docker \
92+
&& curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
93+
&& chmod a+r /etc/apt/keyrings/docker.gpg \
94+
&& echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
95+
"$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
96+
tee /etc/apt/sources.list.d/docker.list > /dev/null \
97+
&& apt-get update \
98+
&& apt-get install -y --no-install-recommends docker-ce docker-buildx-plugin \
99+
&& rm -rf /var/lib/apt/lists/* \
100+
&& sed -i 's/cgroupfs_mount$/#cgroupfs_mount\n/' /etc/init.d/docker \
101+
&& sed -i 's/ulimit -Hn/# ulimit -Hn/g' /etc/init.d/docker \
102102
&& echo "Ensuring Legacy Iptables ..." \
103-
&& update-alternatives --set iptables /usr/sbin/iptables-legacy \
104-
&& update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
103+
&& update-alternatives --set iptables /usr/sbin/iptables-legacy \
104+
&& update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
105105

106106
# entrypoint is our wrapper script, in Prow you will need to explicitly re-specify this
107107
ENTRYPOINT ["wrapper.sh"]

images/kubekins-e2e-v2/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Includes basic workspace setup, with gcloud and a bootstrap runner
1616

17-
FROM debian:bookworm
17+
FROM debian:bookworm-20251020
1818
ARG TARGETARCH
1919

2020
WORKDIR /workspace
@@ -67,11 +67,11 @@ RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
6767
tar xzf google-cloud-sdk.tar.gz -C / && \
6868
rm google-cloud-sdk.tar.gz && \
6969
if [ "${TARGETARCH}" != "ppc64le" ] && [ "${TARGETARCH}" != "s390x" ]; then \
70-
/google-cloud-sdk/install.sh \
71-
--disable-installation-options \
72-
--bash-completion=false \
73-
--path-update=false \
74-
--usage-reporting=false; \
70+
/google-cloud-sdk/install.sh \
71+
--disable-installation-options \
72+
--bash-completion=false \
73+
--path-update=false \
74+
--usage-reporting=false; \
7575
fi && \
7676
gcloud components install alpha beta gke-gcloud-auth-plugin && \
7777
gcloud info | tee /workspace/gcloud-info.txt

0 commit comments

Comments
 (0)