diff --git a/1.20/main/Dockerfile b/1.20/main/Dockerfile index 54a5f5d..8297563 100644 --- a/1.20/main/Dockerfile +++ b/1.20/main/Dockerfile @@ -29,10 +29,9 @@ RUN \ gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libc6-dev-riscv64-cross \ libc6-riscv64-cross linux-libc-dev-riscv64-cross \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /tmp/osxcross \ - && mkdir -p /usr/local/cargo/bin + && mkdir -p /tmp/osxcross -COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/cargo/bin/rcodesign +COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/bin/rcodesign ARG PROM_OSX_SDK_URL ENV OSXCROSS_PATH=/usr/osxcross \ @@ -52,6 +51,6 @@ RUN \ WORKDIR /app -ENV PATH /usr/local/cargo/bin:$OSXCROSS_PATH/bin:$PATH +ENV PATH $OSXCROSS_PATH/bin:$PATH COPY rootfs / diff --git a/1.21/main/Dockerfile b/1.21/main/Dockerfile index 66b5052..442527c 100644 --- a/1.21/main/Dockerfile +++ b/1.21/main/Dockerfile @@ -29,10 +29,9 @@ RUN \ gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libc6-dev-riscv64-cross \ libc6-riscv64-cross linux-libc-dev-riscv64-cross \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /tmp/osxcross \ - && mkdir -p /usr/local/cargo/bin + && mkdir -p /tmp/osxcross -COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/cargo/bin/rcodesign +COPY --from=rustbuilder /usr/local/cargo/bin/rcodesign /usr/local/bin/rcodesign ARG PROM_OSX_SDK_URL ENV OSXCROSS_PATH=/usr/osxcross \ @@ -52,6 +51,6 @@ RUN \ WORKDIR /app -ENV PATH /usr/local/cargo/bin:$OSXCROSS_PATH/bin:$PATH +ENV PATH $OSXCROSS_PATH/bin:$PATH COPY rootfs /