Skip to content

Commit

Permalink
deps: pin curl in optimized container
Browse files Browse the repository at this point in the history
We previously pinned curl in the base-python but in `builder/Dockerfile`
we redownload curl using apk without
it being pinned.

This ensures we are pulling the curl version into the optimized
container and the base-python container.

Signed-off-by: Lance Austin <laustin@datawire.io>

Signed-off-by: Hamzah Qudsi <hqudsi@datawire.io>
  • Loading branch information
Lance Austin authored and Hamzah Qudsi committed Jul 27, 2022
1 parent 33e4e08 commit 1041908
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ADD go.sum go.sum

RUN --mount=type=cache,target=/root/.cache/go-build \
mkdir -p /go/bin && \
time go build -mod=vendor -o /go/bin/ ./cmd/...
time go build -mod=vendor -o /go/bin/ ./cmd/...

########################################
# The artifact build stage
Expand Down Expand Up @@ -126,7 +126,7 @@ ARG py_version="i-forgot-to-set-build-arg-py-version"
RUN adduser ambassador -u 8888 -G root -D -H -s /bin/false

# External stuff that should change infrequently
RUN apk --no-cache add bash curl python3=${py_version} libcap htop
RUN apk --no-cache add bash curl=~7.80 python3=${py_version} libcap htop
RUN apk upgrade --no-cache
RUN ln -s /usr/bin/python3 /usr/bin/python
COPY --from=artifacts /usr/bin/kubectl /usr/bin/kubectl
Expand Down
2 changes: 1 addition & 1 deletion docker/base-python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN apk --no-cache add \
gcc \
make \
musl-dev \
curl=~7.80.0-r2 \
curl=~7.80 \
cython \
docker-cli \
git \
Expand Down

0 comments on commit 1041908

Please sign in to comment.