Copy from the correct directory

Seems like the rcodesign binary ended up in `/usr/local/cargo` not /root... Signed-off-by: Alper Polat <[email protected]>
prometheus · Feb 5, 2024 · 5fb85b9 · 5fb85b9
1 parent ae4285a
commit 5fb85b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git 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
@@ -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 /