deps: pin curl in optimized container

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 <[email protected]> Signed-off-by: Hamzah Qudsi <[email protected]>
emissary-ingress · Jul 27, 2022 · 1041908 · 1041908
1 parent 33e4e08
commit 1041908
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -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
@@ -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

diff --git a/docker/base-python/Dockerfile b/docker/base-python/Dockerfile
@@ -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 \