Make rustup and cargo usable by non-root

Closes tokio-rs#2
cramertj · Aug 4, 2017 · 7423694 · 7423694
1 parent 562f805
commit 7423694
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/1.19.0/jessie/Dockerfile b/1.19.0/jessie/Dockerfile
@@ -1,7 +1,10 @@
 FROM buildpack-deps:jessie
 
-ENV RUST_VERSION=1.19.0
-ENV RUSTUP_VERSION=1.5.0
+ENV RUST_VERSION=1.19.0 \
+    RUSTUP_VERSION=1.5.0 \
+    RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
 
 RUN set -eux; \
     \
@@ -21,10 +24,8 @@ RUN set -eux; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --default-toolchain "${RUST_VERSION}"; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rm rustup-init; \
-    export PATH="/root/.cargo/bin:$PATH"; \
     rustup --version; \
     cargo --version; \
     rustc --version;
-
-ENV PATH /root/.cargo/bin:$PATH
diff --git a/1.19.0/stretch/Dockerfile b/1.19.0/stretch/Dockerfile
@@ -1,7 +1,10 @@
 FROM buildpack-deps:stretch
 
-ENV RUST_VERSION=1.19.0
-ENV RUSTUP_VERSION=1.5.0
+ENV RUST_VERSION=1.19.0 \
+    RUSTUP_VERSION=1.5.0 \
+    RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
 
 RUN set -eux; \
     \
@@ -21,10 +24,8 @@ RUN set -eux; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --default-toolchain "${RUST_VERSION}"; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rm rustup-init; \
-    export PATH="/root/.cargo/bin:$PATH"; \
     rustup --version; \
     cargo --version; \
     rustc --version;
-
-ENV PATH /root/.cargo/bin:$PATH
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -1,7 +1,10 @@
 FROM buildpack-deps:%%DEBIAN-SUITE%%
 
-ENV RUST_VERSION=%%RUST-VERSION%%
-ENV RUSTUP_VERSION=%%RUSTUP-VERSION%%
+ENV RUST_VERSION=%%RUST-VERSION%% \
+    RUSTUP_VERSION=%%RUSTUP-VERSION%% \
+    RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
 
 RUN set -eux; \
     \
@@ -13,10 +16,8 @@ RUN set -eux; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
     ./rustup-init -y --no-modify-path --default-toolchain "${RUST_VERSION}"; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rm rustup-init; \
-    export PATH="/root/.cargo/bin:$PATH"; \
     rustup --version; \
     cargo --version; \
     rustc --version;
-
-ENV PATH /root/.cargo/bin:$PATH