Skip to content

Commit 2517991

Browse files
committed
Make Dockerfile also work when certain lib directories aren't available.
1 parent ce4498c commit 2517991

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: release/final.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COPY --from=builder /usr/lib/*-linux-gnu /usr/lib/aarch_64-linux-gnu/
2727
COPY --from=builder /lib/*-linux-gnu /lib/x86_64-linux-gnu/
2828
COPY --from=builder /lib/*-linux-gnu /lib/aarch_64-linux-gnu/
2929

30-
COPY --from=builder /lib64/ld-linux-*.so.2 /lib64/
30+
COPY --from=builder /lib64*/ld-linux-*.so.2 /lib64/
3131

3232
COPY --from=builder /protocurl/ /protocurl/
3333
ENTRYPOINT ["/protocurl/bin/protocurl"]

Diff for: test/suite/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ COPY --from=builder /lib/*-linux-gnu /lib/x86_64-linux-gnu/
4747
COPY --from=builder /lib/*-linux-gnu /lib/aarch_64-linux-gnu/
4848
COPY --from=builder /usr/lib/*-linux-gnu /usr/lib/x86_64-linux-gnu/
4949
COPY --from=builder /usr/lib/*-linux-gnu /usr/lib/aarch_64-linux-gnu/
50-
COPY --from=builder /lib64/ld-linux-*.so.2 /lib64/
50+
COPY --from=builder /lib64*/ld-linux-*.so.2 /lib64/
5151
" >>$TMP_DOCKERFILE
5252
grep "^ENTRYPOINT " release/final.Dockerfile >>$TMP_DOCKERFILE
5353
remove-leading-spaces-inplace $TMP_DOCKERFILE

0 commit comments

Comments
 (0)