Use /usr/local/bin instead

Keep it simpler, we don't need the `cargo` directory. Signed-off-by: Alper Polat <[email protected]>
prometheus · Feb 5, 2024 · 84cf3b5 · 84cf3b5
1 parent 5fb85b9
commit 84cf3b5
Show file tree

Hide file tree

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