diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 29686ace8b7d8..b4ff7cdcbbc16 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -8,7 +8,7 @@ FROM docker.io/library/registry:2.8 as registry FROM docker.io/bitnami/kubectl:1.23.6 as kubectl -FROM ubuntu:21.10 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install --fix-missing -y \ @@ -64,6 +64,11 @@ COPY ./test/fixture/testrepos/ssh_host_*_key* /etc/ssh/ # Copy redis binaries to the image COPY --from=redis /usr/local/bin/* /usr/local/bin/ +# Copy redis dependencies/shared libraries +# Ubuntu 22.04+ has moved to OpenSSL3 and no longer provides these libraries +COPY --from=redis /usr/lib/x86_64-linux-gnu/libssl.so.1.1 /usr/lib/x86_64-linux-gnu/ +COPY --from=redis /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/ + # Copy registry binaries to the image COPY --from=registry /bin/registry /usr/local/bin/ COPY --from=registry /etc/docker/registry/config.yml /etc/docker/registry/config.yml diff --git a/test/remote/Dockerfile b/test/remote/Dockerfile index 5b3d5d7ccc7ce..c96b26174110d 100644 --- a/test/remote/Dockerfile +++ b/test/remote/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.18 AS go RUN go install github.com/mattn/goreman@latest && \ go install github.com/kisielk/godepgraph@latest -FROM ubuntu:21.10 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install --no-install-recommends -y \