Skip to content

Commit fb2c6fe

Browse files
committed
Update Dockerfile and Makefile to remove --no-cache option and copy helper binaries
1 parent 95ca2cc commit fb2c6fe

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

circleci/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ push-all:: push-extbuilder-$1
4747
push-extbuilder-all:: push-extbuilder-$1
4848

4949
build-exttester-$1:
50-
docker build --no-cache \
50+
docker build \
5151
exttester/ \
5252
-f exttester/Dockerfile \
5353
--build-arg=PG_VERSION=$1 \

circleci/images/exttester/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ apt-get install -y --no-install-recommends --allow-downgrades \
178178
rm -rf /var/lib/apt/lists/*
179179
EOF
180180

181+
# ---------- copy helper binaries ----------
182+
COPY --from=dev-tools-collection /collect/ /
183+
181184
# now do the symlink (outside the heredoc!) in its own layer
182185
RUN ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
183186
/usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \

0 commit comments

Comments
 (0)