Fix dockerfiles not being copied in correctly

cargo-prebuilt · Dec 29, 2024 · 30f0484 · 30f0484
1 parent e729832
commit 30f0484
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/docker/base/step0.Dockerfile b/docker/base/step0.Dockerfile
@@ -20,7 +20,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/base/step0 /ink/scripts/base/step0
-COPY ./docker/base/step0.Dockerfile /ink/dockerfiles
+COPY ./docker/base/step0.Dockerfile /ink/dockerfiles/
 
 # Upgrade and install apt packages
 RUN /ink/scripts/base/step0/manage-apt.sh

diff --git a/docker/base/step1.Dockerfile b/docker/base/step1.Dockerfile
@@ -12,7 +12,7 @@ ENV RUST_VERSION=${RUST_VERSION}
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/base/step1 /ink/scripts/base/step1
-COPY ./docker/base/step1.Dockerfile /ink/dockerfiles
+COPY ./docker/base/step1.Dockerfile /ink/dockerfiles/
 
 # Install rust toolchain
 RUN /ink/scripts/base/step1/install-rustup.sh

diff --git a/docker/base/step2-clang.Dockerfile b/docker/base/step2-clang.Dockerfile
@@ -12,7 +12,7 @@ ENV LLVM_VERSION=${LLVM_VERSION}
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/base/step2-clang /ink/scripts/base/step2-clang
-COPY ./docker/base/step2-clang.Dockerfile /ink/dockerfiles
+COPY ./docker/base/step2-clang.Dockerfile /ink/dockerfiles/
 
 # Override gnu cmake toolchain
 COPY ./cmake/toolchain-clang.cmake /opt/toolchain.cmake

diff --git a/docker/target/clang/aarch64-unknown-freebsd.Dockerfile b/docker/target/clang/aarch64-unknown-freebsd.Dockerfile
@@ -29,7 +29,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/bsd/freebsd /ink/scripts/target/bsd/freebsd
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Setup clang
 ENV PATH=$PATH:$CROSS_SYSROOT/usr/bin

diff --git a/docker/target/clang/aarch64-unknown-linux-musl.Dockerfile b/docker/target/clang/aarch64-unknown-linux-musl.Dockerfile
@@ -39,7 +39,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/musl /ink/scripts/target/musl
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install sysroot (musl + libstdc++ + libgcc)
 COPY --from=rooter /opt/export $CROSS_SYSROOT/usr

diff --git a/docker/target/clang/armv7-unknown-linux-musleabihf.Dockerfile b/docker/target/clang/armv7-unknown-linux-musleabihf.Dockerfile
@@ -39,7 +39,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/musl /ink/scripts/target/musl
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install sysroot (musl + libstdc++ + libgcc)
 COPY --from=rooter /opt/export $CROSS_SYSROOT/usr

diff --git a/docker/target/clang/x86_64-unknown-freebsd.Dockerfile b/docker/target/clang/x86_64-unknown-freebsd.Dockerfile
@@ -25,7 +25,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/bsd/freebsd /ink/scripts/target/bsd/freebsd
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Setup clang
 ENV PATH=$PATH:$CROSS_SYSROOT/usr/bin

diff --git a/docker/target/clang/x86_64-unknown-linux-musl.Dockerfile b/docker/target/clang/x86_64-unknown-linux-musl.Dockerfile
@@ -39,7 +39,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/musl /ink/scripts/target/musl
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install sysroot (musl + libstdc++ + libgcc)
 COPY --from=rooter /opt/export $CROSS_SYSROOT/usr

diff --git a/docker/target/clang/x86_64-unknown-netbsd.Dockerfile b/docker/target/clang/x86_64-unknown-netbsd.Dockerfile
@@ -25,7 +25,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/bsd/netbsd /ink/scripts/target/bsd/netbsd
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Setup clang
 ENV PATH=$PATH:$CROSS_SYSROOT/usr/bin

diff --git a/docker/target/clang/x86_64-unknown-openbsd.Dockerfile b/docker/target/clang/x86_64-unknown-openbsd.Dockerfile
@@ -31,7 +31,7 @@ ARG LLVM_TARGET=$RUST_TARGET
 COPY ./scripts/target/clang /ink/scripts/target/clang
 COPY ./scripts/target/bsd/openbsd /ink/scripts/target/bsd/openbsd
 COPY ./scripts/target/musl /ink/scripts/target/musl
-COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/clang/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Setup clang
 ENV PATH=$PATH:$CROSS_SYSROOT/usr/bin

diff --git a/docker/target/gnu/aarch64-unknown-linux-gnu.Dockerfile b/docker/target/gnu/aarch64-unknown-linux-gnu.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-aarch64-linux-gnu libc6-dev-arm64-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/armv7-unknown-linux-gnueabihf.Dockerfile b/docker/target/gnu/armv7-unknown-linux-gnueabihf.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-arm-linux-gnueabihf libc6-dev-armhf-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/powerpc64-unknown-linux-gnu.Dockerfile b/docker/target/gnu/powerpc64-unknown-linux-gnu.Dockerfile
@@ -26,7 +26,7 @@ ARG GCC_PKGS="g++-powerpc64-linux-gnu libc6-dev-ppc64-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/powerpc64le-unknown-linux-gnu.Dockerfile b/docker/target/gnu/powerpc64le-unknown-linux-gnu.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-powerpc64le-linux-gnu libc6-dev-ppc64el-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/riscv64gc-unknown-linux-gnu.Dockerfile b/docker/target/gnu/riscv64gc-unknown-linux-gnu.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-riscv64-linux-gnu libc6-dev-riscv64-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/s390x-unknown-linux-gnu.Dockerfile b/docker/target/gnu/s390x-unknown-linux-gnu.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-s390x-linux-gnu libc6-dev-s390x-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/sparc64-unknown-linux-gnu.Dockerfile b/docker/target/gnu/sparc64-unknown-linux-gnu.Dockerfile
@@ -26,7 +26,7 @@ ARG GCC_PKGS="g++-sparc64-linux-gnu libc6-dev-sparc64-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh

diff --git a/docker/target/gnu/x86_64-unknown-linux-gnu.Dockerfile b/docker/target/gnu/x86_64-unknown-linux-gnu.Dockerfile
@@ -22,7 +22,7 @@ ARG GCC_PKGS="g++-x86-64-linux-gnu libc6-dev-amd64-cross"
 
 # Copy required scripts and Dockerfile
 COPY ./scripts/target/gnu /ink/scripts/target/gnu
-COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles
+COPY ./docker/target/gnu/$RUST_TARGET.Dockerfile /ink/dockerfiles/
 
 # Install gcc packages
 RUN /ink/scripts/target/gnu/manage-apt.sh