From 03c825853cd16879646d455cede9465a791205a0 Mon Sep 17 00:00:00 2001 From: ericzzzzzzz <102683393+ericzzzzzzz@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:13:40 -0500 Subject: [PATCH 1/4] chore: change skaffold base image --- deploy/skaffold/Dockerfile.deps | 2 +- deploy/skaffold/Dockerfile.deps.lts | 2 +- deploy/skaffold/Dockerfile.deps.slim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index 0e5ed90f3dc..f16491e1282 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -115,7 +115,7 @@ RUN \ sha256sum -c bazel.${ARCH}.sha256 RUN chmod +x bazel -FROM gcr.io/gcp-runtimes/ubuntu_20_0_4 as runtime_deps +FROM gcr.io/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps RUN apt-get update && \ apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/deploy/skaffold/Dockerfile.deps.lts b/deploy/skaffold/Dockerfile.deps.lts index 78626ea4b81..e38f707e8c3 100644 --- a/deploy/skaffold/Dockerfile.deps.lts +++ b/deploy/skaffold/Dockerfile.deps.lts @@ -68,7 +68,7 @@ RUN \ RUN tar -zxf gcloud.tar.gz -FROM gcr.io/gcp-runtimes/ubuntu_20_0_4 as runtime_deps +FROM gcr.io/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps RUN apt-get update && \ apt-get install --no-install-recommends --no-install-suggests -y \ diff --git a/deploy/skaffold/Dockerfile.deps.slim b/deploy/skaffold/Dockerfile.deps.slim index 1c24da2bba6..7d198fe2ffb 100644 --- a/deploy/skaffold/Dockerfile.deps.slim +++ b/deploy/skaffold/Dockerfile.deps.slim @@ -68,7 +68,7 @@ RUN \ RUN tar -zxf gcloud.tar.gz -FROM gcr.io/gcp-runtimes/ubuntu_20_0_4 as runtime_deps +FROM gcr.io/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps RUN apt-get update && \ apt-get install --no-install-recommends --no-install-suggests -y \ From 36ebaf14dc2460df1da80453ade461d10f10ca61 Mon Sep 17 00:00:00 2001 From: ericzzzzzzz <102683393+ericzzzzzzz@users.noreply.github.com> Date: Tue, 14 Feb 2023 08:09:22 -0500 Subject: [PATCH 2/4] fix: skaffold image dependencies install issues --- deploy/skaffold/Dockerfile.deps | 3 ++- deploy/skaffold/Dockerfile.deps.lts | 3 ++- deploy/skaffold/Dockerfile.deps.slim | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index f16491e1282..7e0e8c8b724 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -151,7 +151,8 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ +DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ lsb-release \ diff --git a/deploy/skaffold/Dockerfile.deps.lts b/deploy/skaffold/Dockerfile.deps.lts index e38f707e8c3..0a4797fe31c 100644 --- a/deploy/skaffold/Dockerfile.deps.lts +++ b/deploy/skaffold/Dockerfile.deps.lts @@ -95,7 +95,8 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ +DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ lsb-release \ diff --git a/deploy/skaffold/Dockerfile.deps.slim b/deploy/skaffold/Dockerfile.deps.slim index 7d198fe2ffb..4a429d0361d 100644 --- a/deploy/skaffold/Dockerfile.deps.slim +++ b/deploy/skaffold/Dockerfile.deps.slim @@ -95,7 +95,8 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ +DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ lsb-release \ From d74dfb4c6937904e041d3977dafc8d8856357efa Mon Sep 17 00:00:00 2001 From: ericzzzzzzz <102683393+ericzzzzzzz@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:47:23 -0500 Subject: [PATCH 3/4] chore: add env --- deploy/skaffold/Dockerfile.deps | 2 +- deploy/skaffold/Dockerfile.deps.lts | 2 +- deploy/skaffold/Dockerfile.deps.slim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index 7e0e8c8b724..3e9a3799961 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -151,7 +151,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -DEBIAN_FRONTEND=noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ diff --git a/deploy/skaffold/Dockerfile.deps.lts b/deploy/skaffold/Dockerfile.deps.lts index 0a4797fe31c..692b56dd423 100644 --- a/deploy/skaffold/Dockerfile.deps.lts +++ b/deploy/skaffold/Dockerfile.deps.lts @@ -95,7 +95,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -DEBIAN_FRONTEND=noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ diff --git a/deploy/skaffold/Dockerfile.deps.slim b/deploy/skaffold/Dockerfile.deps.slim index 4a429d0361d..8d184d4e583 100644 --- a/deploy/skaffold/Dockerfile.deps.slim +++ b/deploy/skaffold/Dockerfile.deps.slim @@ -95,7 +95,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ log-streaming FROM runtime_deps -DEBIAN_FRONTEND=noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ build-essential \ python-setuptools \ From 7236fd18a9bb718a47e98c6c7532460083b9edc7 Mon Sep 17 00:00:00 2001 From: ericzzzzzzz <102683393+ericzzzzzzz@users.noreply.github.com> Date: Thu, 16 Feb 2023 09:44:14 -0500 Subject: [PATCH 4/4] chore: install curl in skaffold base image --- deploy/skaffold/Dockerfile.deps | 1 + deploy/skaffold/Dockerfile.deps.lts | 1 + deploy/skaffold/Dockerfile.deps.slim | 1 + 3 files changed, 3 insertions(+) diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index 3e9a3799961..d37feeceea1 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -153,6 +153,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ FROM runtime_deps ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ + curl \ build-essential \ python-setuptools \ lsb-release \ diff --git a/deploy/skaffold/Dockerfile.deps.lts b/deploy/skaffold/Dockerfile.deps.lts index 692b56dd423..48c87cd2ba5 100644 --- a/deploy/skaffold/Dockerfile.deps.lts +++ b/deploy/skaffold/Dockerfile.deps.lts @@ -97,6 +97,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ FROM runtime_deps ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ + curl \ build-essential \ python-setuptools \ lsb-release \ diff --git a/deploy/skaffold/Dockerfile.deps.slim b/deploy/skaffold/Dockerfile.deps.slim index 8d184d4e583..2e9eae1417b 100644 --- a/deploy/skaffold/Dockerfile.deps.slim +++ b/deploy/skaffold/Dockerfile.deps.slim @@ -97,6 +97,7 @@ RUN gcloud auth configure-docker && gcloud components install --quiet \ FROM runtime_deps ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \ + curl \ build-essential \ python-setuptools \ lsb-release \