From 5fb85b9558ebd05c709047b1706e84ef63fbaf34 Mon Sep 17 00:00:00 2001 From: Alper Polat Date: Mon, 5 Feb 2024 21:24:08 +0200 Subject: [PATCH] Copy from the correct directory Seems like the rcodesign binary ended up in `/usr/local/cargo` not /root... Signed-off-by: Alper Polat --- 1.20/main/Dockerfile | 8 +++----- 1.21/main/Dockerfile | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/1.20/main/Dockerfile b/1.20/main/Dockerfile index ec3d3c7..54a5f5d 100644 --- a/1.20/main/Dockerfile +++ b/1.20/main/Dockerfile @@ -30,9 +30,9 @@ RUN \ libc6-riscv64-cross linux-libc-dev-riscv64-cross \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /tmp/osxcross \ - && mkdir -p /root/.cargo + && mkdir -p /usr/local/cargo/bin -COPY --from=rustbuilder /root/.cargo/bin /root/.cargo/bin +COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/cargo/bin/rcodesign ARG PROM_OSX_SDK_URL ENV OSXCROSS_PATH=/usr/osxcross \ @@ -52,8 +52,6 @@ RUN \ WORKDIR /app -ENV PATH /root/.cargo/bin:$OSXCROSS_PATH/bin:$PATH - -RUN cargo install --git https://github.com/indygreg/apple-platform-rs --branch main --bin rcodesign apple-codesign +ENV PATH /usr/local/cargo/bin:$OSXCROSS_PATH/bin:$PATH COPY rootfs / diff --git a/1.21/main/Dockerfile b/1.21/main/Dockerfile index 6f3d099..66b5052 100644 --- a/1.21/main/Dockerfile +++ b/1.21/main/Dockerfile @@ -30,9 +30,9 @@ RUN \ libc6-riscv64-cross linux-libc-dev-riscv64-cross \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /tmp/osxcross \ - && mkdir -p /root/.cargo - -COPY --from=rustbuilder /root/.cargo/bin /root/.cargo/bin + && mkdir -p /usr/local/cargo/bin + +COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/cargo/bin/rcodesign ARG PROM_OSX_SDK_URL ENV OSXCROSS_PATH=/usr/osxcross \ @@ -52,6 +52,6 @@ RUN \ WORKDIR /app -ENV PATH /root/.cargo/bin:$OSXCROSS_PATH/bin:$PATH +ENV PATH /usr/local/cargo/bin:$OSXCROSS_PATH/bin:$PATH COPY rootfs /