Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change skaffold base image #8433

Merged
merged 4 commits into from
Feb 16, 2023
Merged

chore: change skaffold base image #8433

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03c8258
chore: change skaffold base image
ericzzzzzzz Feb 13, 2023
36ebaf1
fix: skaffold image dependencies install issues
ericzzzzzzz Feb 14, 2023
d74dfb4
chore: add env
ericzzzzzzz Feb 14, 2023
7236fd1
chore: install curl in skaffold base image
ericzzzzzzz Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deploy/skaffold/Dockerfile.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends --no-install-suggests -y \
ericzzzzzzz marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add curl to the packages installed here? It seems this tool is not installed in Debian Bullseye but is in Ubuntu

This likely needs to be done in all of the Dockerfile.deps* files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this got partially reverted in #8460 it looks like this lost curl as we went from gcr.io/gcp-runtimes/ubuntu_20_0_4 which included curl to ubuntu:20.04 which doesn't.

Can curl be added back into the released Skaffold images please?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomelliff thanks for flagging, this. I've created this issue #8668 tracking this and added it to Skaffold's next release -v2.4.0 which is targeting release for 4/17

build-essential \
python-setuptools \
lsb-release \
Expand Down
5 changes: 3 additions & 2 deletions deploy/skaffold/Dockerfile.deps.lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
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 \
lsb-release \
Expand Down
5 changes: 3 additions & 2 deletions deploy/skaffold/Dockerfile.deps.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
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 \
lsb-release \
Expand Down