chore: Update skaffold base image (GoogleContainerTools#8460)

* chore: Revert "chore: change skaffold base image (GoogleContainerTools#8433)" This reverts commit 6b3f673. * chore: update skaffold base image to ubuntu:20.04 * chore: add noninteractive
aaron-prindle · Feb 23, 2023 · 9847653 · 9847653
1 parent 1025487
commit 9847653
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps
+FROM ubuntu:20.04 as runtime_deps
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \
@@ -152,8 +152,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 \
+RUN apt-get update && 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
@@ -68,7 +68,7 @@ RUN \
 RUN tar -zxf gcloud.tar.gz
 
 
-FROM gcr.io/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps
+FROM ubuntu:20.04 as runtime_deps
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \
@@ -96,8 +96,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 \
+RUN apt-get update && 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
@@ -68,7 +68,7 @@ RUN \
 RUN tar -zxf gcloud.tar.gz
 
 
-FROM gcr.io/gke-release/debian-base:bullseye-v1.4.2-gke.8 as runtime_deps
+FROM ubuntu:20.04 as runtime_deps
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --no-install-suggests -y \
@@ -96,8 +96,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 \
+RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
     build-essential \
     python-setuptools \
     lsb-release \