diff --git a/components/core/tools/docker-images/clp-core-ubuntu-jammy/Dockerfile b/components/core/tools/docker-images/clp-core-ubuntu-jammy/Dockerfile index 1ef6262b08..bb3be48ee0 100644 --- a/components/core/tools/docker-images/clp-core-ubuntu-jammy/Dockerfile +++ b/components/core/tools/docker-images/clp-core-ubuntu-jammy/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ubuntu:jammy AS base # Install runtime dependencies @@ -14,15 +16,15 @@ RUN apt-get clean \ WORKDIR /clp -ADD ./clg ./ -ADD ./clp ./ -ADD ./clp-s ./ -ADD ./glt ./ -ADD ./make-dictionaries-readable ./ +COPY --link ./clg ./ +COPY --link ./clp ./ +COPY --link ./clp-s ./ +COPY --link ./glt ./ +COPY --link ./make-dictionaries-readable ./ # Flatten the image FROM scratch -COPY --from=base / / +COPY --link --from=base / / WORKDIR /clp diff --git a/components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile b/components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile index 4375a5c26b..88d43092ba 100644 --- a/components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-centos-stream-9/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM dokken/centos-stream-9 AS base WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -ADD ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install # Set pipx environment vars so that the pipx scripts install into the global locations without # passing the `--global` flag. @@ -18,4 +20,4 @@ RUN dnf clean all \ # Flatten the image FROM scratch -COPY --from=base / / +COPY --link --from=base / / diff --git a/components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/Dockerfile b/components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/Dockerfile index b47ab452d0..3fb9747253 100644 --- a/components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-manylinux_2_28-aarch64/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM quay.io/pypa/manylinux_2_28_aarch64 WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -COPY ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install RUN pipx uninstall cmake RUN pipx uninstall uv diff --git a/components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/Dockerfile b/components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/Dockerfile index 0a11a31f7a..4d2fb54b0f 100644 --- a/components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-manylinux_2_28-x86_64/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM quay.io/pypa/manylinux_2_28_x86_64 WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -COPY ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install RUN pipx uninstall cmake RUN pipx uninstall uv diff --git a/components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile b/components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile index d6e1d5cd92..5dacb6b846 100644 --- a/components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-musllinux_1_2-aarch64/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM quay.io/pypa/musllinux_1_2_aarch64 WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -COPY ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install RUN pipx uninstall cmake RUN pipx uninstall uv diff --git a/components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile b/components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile index 65e92cf197..d6c427ae3c 100644 --- a/components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-musllinux_1_2-x86_64/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM quay.io/pypa/musllinux_1_2_x86_64 AS base WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -COPY ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install RUN pipx uninstall cmake RUN pipx uninstall uv diff --git a/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile index 993bb8ae82..bc979e93b2 100644 --- a/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile @@ -1,9 +1,11 @@ +# syntax=docker/dockerfile:1 + FROM ubuntu:jammy AS base WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install -ADD ./tools/scripts/lib_install ./tools/scripts/lib_install +COPY --link ./tools/scripts/lib_install ./tools/scripts/lib_install # Set pipx environment vars so that the pipx scripts install into the global locations without # passing the `--global` flag. @@ -18,4 +20,4 @@ RUN apt-get clean \ # Flatten the image FROM scratch -COPY --from=base / / +COPY --link --from=base / / diff --git a/tools/docker-images/clp-package/Dockerfile b/tools/docker-images/clp-package/Dockerfile index 9d1bc5c71e..74e9d97907 100644 --- a/tools/docker-images/clp-package/Dockerfile +++ b/tools/docker-images/clp-package/Dockerfile @@ -1,8 +1,10 @@ +# syntax=docker/dockerfile:1 + FROM ubuntu:jammy AS base WORKDIR /root -COPY ./tools/docker-images/clp-package/setup-scripts ./setup-scripts +COPY --link ./tools/docker-images/clp-package/setup-scripts ./setup-scripts RUN ./setup-scripts/install-prebuilt-packages.sh \ && rm -rf ./setup-scripts/ @@ -17,8 +19,8 @@ ENV PYTHONPATH="${CLP_HOME}/lib/python3/site-packages" USER 1000:1000 -COPY ./build/clp-package /opt/clp +COPY --link ./build/clp-package /opt/clp # Flatten the image FROM scratch -COPY --from=base / / +COPY --link --from=base / /