diff --git a/dockerfile/avalanche/Dockerfile b/dockerfile/avalanche/Dockerfile index 3a782915..e065a780 100644 --- a/dockerfile/avalanche/Dockerfile +++ b/dockerfile/avalanche/Dockerfile @@ -40,7 +40,7 @@ RUN set -eux;\ LIBDIR=/usr/aarch64-linux-musl/lib;\ mkdir -p $LIBDIR;\ export CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++;\ - fi;\ + fi;\ elif [ "${TARGETARCH}" = "amd64" ]; then\ export ARCH=x86_64;\ if [ "${BUILDARCH}" != "amd64" ]; then\ @@ -117,8 +117,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/rm ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir amd vi from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/vi ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -155,7 +155,7 @@ RUN for b in \ ; do ln sh $b; done # Remove write utils -RUN rm ln rm +RUN rm ln # Install chain binaries COPY --from=build-env /root/bin /bin diff --git a/dockerfile/avalanche/native.Dockerfile b/dockerfile/avalanche/native.Dockerfile index f1f37493..6805bd38 100644 --- a/dockerfile/avalanche/native.Dockerfile +++ b/dockerfile/avalanche/native.Dockerfile @@ -94,8 +94,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/rm ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, amd vi from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/vi ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -132,7 +132,7 @@ RUN for b in \ ; do ln sh $b; done # Remove write utils -RUN rm ln rm +RUN rm ln # Install chain binaries COPY --from=build-env /root/bin /bin diff --git a/dockerfile/cargo/Dockerfile b/dockerfile/cargo/Dockerfile index 03cda3bb..9525a31d 100644 --- a/dockerfile/cargo/Dockerfile +++ b/dockerfile/cargo/Dockerfile @@ -226,8 +226,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links), rm (for cleanup), mv, mkdir, and dirname from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -301,7 +301,7 @@ ARG FINAL_IMAGE RUN if [ ! -z "$FINAL_IMAGE" ]; then sh -c "$FINAL_IMAGE"; fi # Remove write utils used to construct image and tmp dir/file for lib copy. -RUN rm -rf ln rm mv mkdir dirname /root/lib_abs /root/lib_abs.list +RUN rm -rf ln dirname /root/lib_abs /root/lib_abs.list # Install trusted CA certificates COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem diff --git a/dockerfile/cargo/native.Dockerfile b/dockerfile/cargo/native.Dockerfile index 0e41e28a..224a1073 100644 --- a/dockerfile/cargo/native.Dockerfile +++ b/dockerfile/cargo/native.Dockerfile @@ -176,8 +176,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links), rm (for cleanup), mv, mkdir, and dirname from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -251,7 +251,7 @@ ARG FINAL_IMAGE RUN if [ ! -z "$FINAL_IMAGE" ]; then sh -c "$FINAL_IMAGE"; fi # Remove write utils used to construct image and tmp dir/file for lib copy. -RUN rm -rf ln rm mv mkdir dirname /root/lib_abs /root/lib_abs.list +RUN rm -rf ln dirname /root/lib_abs /root/lib_abs.list # Install trusted CA certificates COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem diff --git a/dockerfile/cosmos/Dockerfile b/dockerfile/cosmos/Dockerfile index 758d9489..d6cd0ef2 100644 --- a/dockerfile/cosmos/Dockerfile +++ b/dockerfile/cosmos/Dockerfile @@ -150,8 +150,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -201,7 +201,7 @@ RUN sh -c 'i=0; while read DIR; do\ done < /root/dir_abs.list' # Remove write utils -RUN rm ln rm mv mkdir dirname +RUN rm ln dirname # Install chain binaries COPY --from=build-env /root/bin /bin diff --git a/dockerfile/cosmos/local.Dockerfile b/dockerfile/cosmos/local.Dockerfile index a5cea38a..34c37741 100644 --- a/dockerfile/cosmos/local.Dockerfile +++ b/dockerfile/cosmos/local.Dockerfile @@ -141,8 +141,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -192,7 +192,7 @@ RUN sh -c 'i=0; while read DIR; do\ done < /root/dir_abs.list' # Remove write utils -RUN rm ln rm mv mkdir dirname +RUN rm ln dirname # Install trusted CA certificates COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem diff --git a/dockerfile/cosmos/localcross.Dockerfile b/dockerfile/cosmos/localcross.Dockerfile index 02366377..deadd73f 100644 --- a/dockerfile/cosmos/localcross.Dockerfile +++ b/dockerfile/cosmos/localcross.Dockerfile @@ -145,8 +145,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -196,7 +196,7 @@ RUN sh -c 'i=0; while read DIR; do\ done < /root/dir_abs.list' # Remove write utils -RUN rm ln rm mv mkdir dirname +RUN rm ln dirname # Install chain binaries COPY --from=build-env /root/bin /bin diff --git a/dockerfile/cosmos/native.Dockerfile b/dockerfile/cosmos/native.Dockerfile index 392e1ff9..6e8815f5 100644 --- a/dockerfile/cosmos/native.Dockerfile +++ b/dockerfile/cosmos/native.Dockerfile @@ -123,8 +123,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links) and rm (for cleanup) from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -174,7 +174,7 @@ RUN sh -c 'i=0; while read DIR; do\ done < /root/dir_abs.list' # Remove write utils -RUN rm ln rm mv mkdir dirname +RUN rm dirname # Install chain binaries COPY --from=build-env /root/bin /bin diff --git a/dockerfile/imported/Dockerfile b/dockerfile/imported/Dockerfile index f3736225..19a00c05 100644 --- a/dockerfile/imported/Dockerfile +++ b/dockerfile/imported/Dockerfile @@ -127,8 +127,8 @@ LABEL org.opencontainers.image.source="https://github.com/strangelove-ventures/h WORKDIR /bin -# Install ln (for making hard links), rm (for cleanup), mv, mkdir, and dirname from full busybox image (will be deleted, only needed for image assembly) -COPY --from=busybox-full /bin/ln /bin/rm /bin/mv /bin/mkdir /bin/dirname ./ +# Install ln (for making hard links), rm (for cleanup), mv, mkdir, vi and dirname from full busybox image (will be deleted, only needed for image assembly) +COPY --from=busybox-full /bin/ln /bin/mv /bin/rm /bin/mkdir /bin/vi /bin/dirname ./ # Install minimal busybox image as shell binary (will create hardlinks for the rest of the binaries to this data) COPY --from=infra-toolkit /busybox/busybox /bin/sh @@ -202,7 +202,7 @@ ARG FINAL_IMAGE RUN if [ ! -z "$FINAL_IMAGE" ]; then sh -c "$FINAL_IMAGE"; fi # Remove write utils used to construct image and tmp dir/file for lib copy. -RUN rm -rf ln rm mv mkdir dirname /root/lib_abs /root/lib_abs.list +RUN rm -rf ln dirname /root/lib_abs /root/lib_abs.list # Install trusted CA certificates COPY --from=alpine-3 /etc/ssl/cert.pem /etc/ssl/cert.pem