From 45f4a0528c9c78c68f361ce392a4d9d852f3fd38 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Wed, 10 Feb 2021 15:56:56 -0600 Subject: [PATCH] Upgrade Debian base images from 10.7 to 10.8. Signed-off-by: Matt Moyer --- Dockerfile | 4 ++-- hack/lib/tilt/Tiltfile | 2 +- hack/lib/tilt/concierge.Dockerfile | 2 +- hack/lib/tilt/local-user-authenticator.Dockerfile | 2 +- hack/lib/tilt/supervisor.Dockerfile | 2 +- test/deploy/dex/proxy.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd05e51e..75f33572 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,11 +27,11 @@ RUN \ ./cmd/local-user-authenticator/... # Use a Debian slim image to grab a reasonable default CA bundle. -FROM debian:10.7-slim AS get-ca-bundle-env +FROM debian:10.8-slim AS get-ca-bundle-env RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/* /var/cache/debconf/* # Use a runtime image based on Debian slim. -FROM debian:10.7-slim +FROM debian:10.8-slim COPY --from=get-ca-bundle-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt # Copy the binaries from the build-env stage. diff --git a/hack/lib/tilt/Tiltfile b/hack/lib/tilt/Tiltfile index f97b8e5c..f7c6d5fa 100644 --- a/hack/lib/tilt/Tiltfile +++ b/hack/lib/tilt/Tiltfile @@ -152,7 +152,7 @@ k8s_yaml(local([ '--data-value namespace=concierge ' + '--data-value image_repo=image/concierge ' + '--data-value image_tag=tilt-dev ' + - '--data-value kube_cert_agent_image=debian:10.7-slim ' + + '--data-value kube_cert_agent_image=debian:10.8-slim ' + '--data-value discovery_url=$(TERM=dumb kubectl cluster-info | awk \'/master|control plane/ {print $NF}\') ' + '--data-value log_level=debug ' + '--data-value-yaml replicas=1 ' + diff --git a/hack/lib/tilt/concierge.Dockerfile b/hack/lib/tilt/concierge.Dockerfile index e9daadd6..7bbdd820 100644 --- a/hack/lib/tilt/concierge.Dockerfile +++ b/hack/lib/tilt/concierge.Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Use a runtime image based on Debian slim -FROM debian:10.7-slim +FROM debian:10.8-slim # Copy the binary which was built outside the container. COPY build/pinniped-concierge /usr/local/bin/pinniped-concierge diff --git a/hack/lib/tilt/local-user-authenticator.Dockerfile b/hack/lib/tilt/local-user-authenticator.Dockerfile index 6b8430f6..b2e98da5 100644 --- a/hack/lib/tilt/local-user-authenticator.Dockerfile +++ b/hack/lib/tilt/local-user-authenticator.Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Use a runtime image based on Debian slim -FROM debian:10.7-slim +FROM debian:10.8-slim # Copy the binary which was built outside the container. COPY build/local-user-authenticator /usr/local/bin/local-user-authenticator diff --git a/hack/lib/tilt/supervisor.Dockerfile b/hack/lib/tilt/supervisor.Dockerfile index 916d009a..94e382cd 100644 --- a/hack/lib/tilt/supervisor.Dockerfile +++ b/hack/lib/tilt/supervisor.Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Use a runtime image based on Debian slim -FROM debian:10.7-slim +FROM debian:10.8-slim RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/* diff --git a/test/deploy/dex/proxy.yaml b/test/deploy/dex/proxy.yaml index c78d8ae9..c8dae2ad 100644 --- a/test/deploy/dex/proxy.yaml +++ b/test/deploy/dex/proxy.yaml @@ -48,7 +48,7 @@ spec: periodSeconds: 5 failureThreshold: 2 - name: accesslogs - image: debian:10.7-slim + image: debian:10.8-slim command: - "/bin/sh" - "-c"