More updated for #6270

Author: nicholasdille

tools/aws/Dockerfile.template

@@ -8,7 +8,7 @@ FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 COPY --link --from=python / /
 ARG name
 ARG version
-COPY <<EOF ${prefix}/etc/profile.d/aws
+COPY <<EOF ${prefix}${target}/etc/profile.d/aws
 complete -C '/usr/local/bin/aws_completer' aws
 EOF
 RUN <<EOF

tools/aws/post_install.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -o errexit
+
+cp "${target}/etc/profile.d/aws" "/etc/profile.d/aws"

tools/aws2/Dockerfile.template

@@ -5,7 +5,7 @@ ARG ref=main
 FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-COPY <<EOF ${prefix}/etc/profile.d/aws
+COPY <<EOF ${prefix}${target}/etc/profile.d/aws
 complete -C '/usr/local/bin/aws_completer' aws
 EOF
 RUN <<EOF

tools/aws2/post_install.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -o errexit
+
+cp "${target}/etc/profile.d/aws" "/etc/profile.d/aws"

tools/conmon/Dockerfile.template

@@ -43,8 +43,8 @@ make -C docs GOMD2MAN=go-md2man
 mv bin/conmon "${prefix}${target}/bin/conmon"
 mv docs/conmon.8 "${prefix}${target}/share/man/man8"
 EOF
-COPY default.yaml ${prefix}/etc/containers/registries.d/default.yaml
-COPY policy.json ${prefix}/etc/containers/policy.json
-COPY policy.conf ${prefix}/etc/containers/policy.conf
-COPY registry.json ${prefix}/etc/containers/registries.json
-COPY storage.conf ${prefix}/etc/containers/storage.conf
+COPY default.yaml ${prefix}${target}/etc/containers/registries.d/default.yaml
+COPY policy.json ${prefix}${target}/etc/containers/policy.json
+COPY policy.conf ${prefix}${target}/etc/containers/policy.conf
+COPY registry.json ${prefix}${target}/etc/containers/registries.json
+COPY storage.conf ${prefix}${target}/etc/containers/storage.conf

tools/containerd/post_install.sh

@@ -15,7 +15,7 @@ fi
 if test -f "/etc/crictl.yaml"; then
     echo "Fixing configuration for cticrl"
     ENDPOINT=unix:///run/containerd/containerd.sock
-    cat "${target}/etc/crictl.yaml" \
+    cat "/etc/crictl.yaml" \
     | sed "s|#runtime-endpoint: YOUR-CHOICE|runtime-endpoint: ${ENDPOINT}|; s|#image-endpoint: YOUR-CHOICE|image-endpoint: ${ENDPOINT}|" \
     >"/etc/crictl.yaml"
 fi

tools/docker-preview/Dockerfile.template

@@ -14,7 +14,7 @@ mkdir -p \
     "${prefix}${docker_setup_contrib}/${name}/openrc"
 EOF
 
-COPY daemon.json ${prefix}/etc/docker-preview/
+COPY daemon.json ${prefix}${target}/etc/docker-preview/
 COPY --chmod=0755 <<EOF ${prefix}${target}/bin/docker-preview
 #!/bin/bash
 set -o errexit

tools/konf/Dockerfile.template

@@ -5,7 +5,7 @@ ARG ref=main
 FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-COPY <<EOF ${prefix}/etc/profile.d/konf.sh
+COPY <<EOF ${prefix}${target}/etc/profile.d/konf.sh
 case "\$(basename "\${SHELL}")" in
     bash)
         source <(konf-go shellwrapper bash)

tools/libcgroup/Dockerfile.template

@@ -14,6 +14,9 @@ apt-get -y install --no-install-recommends \
     bison \
     flex
 EOF
+RUN <<EOF
+mkdir -p "${prefix}${target}/etc/ld.so.conf.d"
+EOF
 COPY <<EOF >${prefix}${target}/etc/ld.so.conf.d/libcgroup.conf
 ${target}/lib
 EOF

tools/rust/Dockerfile.template

@@ -5,7 +5,7 @@ ARG ref=main
 FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-COPY <<EOF ${prefix}/etc/profile.d/cargo.sh
+COPY <<EOF ${prefix}${target}/etc/profile.d/cargo.sh
 #!/bin/bash
 export CARGO_HOME=/opt/cargo
 export RUSTUP_HOME=/opt/rustup