don't pre-install rust packages

mauwii · Oct 19, 2023 · 282462d · 282462d
1 parent 7b9b8c5
commit 282462d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 32 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -84,7 +84,6 @@ target "ubuntu" {
       {
         version            = "22.04"
         codename           = "jammy"
-        CARGO_PACKAGES     = "[\"bindgen-cli\",\"cbindgen\",\"cargo-audit\",\"cargo-outdated\"]"
         DOTNET_CHANNEL     = "LTS"
         DOTNET_DEPS        = "[\"libicu70\",\"libssl3\",\"libunwind8\",\"libgcc-s1\",\"liblttng-ust1\"]"
         DOTNET_SDK_VERSION = "6.0.415"
@@ -93,7 +92,6 @@ target "ubuntu" {
       {
         version            = "20.04"
         codename           = "focal"
-        CARGO_PACKAGES     = "[\"--locked\",\"bindgen-cli\",\"cbindgen\",\"cargo-audit\",\"cargo-outdated\"]"
         DOTNET_CHANNEL     = "LTS"
         DOTNET_DEPS        = "[\"libicu66\",\"libssl1.1\"]"
         DOTNET_SDK_VERSION = "6.0.415"
@@ -104,7 +102,6 @@ target "ubuntu" {
   args = {
     BICEP_VERSION                 = BICEP_VERSION
     CARGO_HOME                    = "/etc/.skel/.cargo"
-    CARGO_PACKAGES                = release.CARGO_PACKAGES
     CODENAME                      = release.codename
     DEPENDENCIES                  = DEPENDENCIES
     DOTNET_CHANNEL                = release.DOTNET_CHANNEL

diff --git a/linux/ubuntu/Dockerfile b/linux/ubuntu/Dockerfile
@@ -118,28 +118,16 @@ RUN bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/ma
     && rm -rf /etc/apt/sources.list.d/* \
     && rm -rf /var/lib/apt/lists/*
 
-ARG FROM_VERSION=22.04
-FROM buildpack-deps:${FROM_VERSION} as rust
+FROM base as rust
 ARG TARGETARCH
 SHELL [ "/bin/bash", "--login", "-e", "-o", "pipefail", "-c" ]
 ARG RUSTUP_HOME=/etc/skel/.rustup
 ARG CARGO_HOME=/etc/skel/.cargo
 ENV PATH=${CARGO_HOME}/bin:${PATH}
-ARG CARGO_PACKAGES
-RUN apt-get -y update \
-    && apt-get -y install --no-install-recommends \
-        jq \
-    && curl -fsSL https://sh.rustup.rs | sh -s -- -y \
-        --default-toolchain=stable \
-        --profile=complete \
-        --no-modify-path \
-        --component rustfmt clippy \
-    && cargo_tools=() \
-    && while IFS='' read -r pkg; do cargo_tools+=("$pkg"); done < <(printf "%s\n" "${CARGO_PACKAGES}" | jq -r '.[]') \
-    && cargo install "${cargo_tools[@]}" \
-    && apt-get clean \
-    && rm -rf /etc/apt/sources.list.d/* \
-    && rm -rf /var/lib/apt/lists/*
+RUN curl -fsSL https://sh.rustup.rs | sh -s -- -y \
+    --default-toolchain=stable \
+    && cargo --version \
+    && rustc --version
 
 FROM base as golang
 ARG TARGETARCH
@@ -332,6 +320,18 @@ RUN apt-get -y update &>/dev/null \
     && rm -rf /etc/apt/sources.list.d/* \
     && rm -rf /var/lib/apt/lists/*
 
+# add rust
+ARG CARGO_HOME=/etc/skel/.cargo
+COPY --link --from=rust ${CARGO_HOME} ${CARGO_HOME}
+ARG RUSTUP_HOME=/etc/skel/.rustup
+COPY --link --from=rust ${RUSTUP_HOME} ${RUSTUP_HOME}
+ENV PATH=${CARGO_HOME}/bin:${PATH} \
+    CARGO_HOME=${CARGO_HOME} \
+    RUSTUP_HOME=${RUSTUP_HOME}
+RUN sed "s|^PATH=|PATH=${CARGO_HOME}/bin:|mg" -i /etc/environment \
+    && echo "CARGO_HOME=${CARGO_HOME}" | tee -a /etc/environment \
+    && echo "RUSTUP_HOME=${RUSTUP_HOME}" | tee -a /etc/environment
+
 # add go
 COPY --link --from=golang /usr/local/go /usr/local/go
 ENV PATH=/usr/local/go/bin:${PATH}
@@ -352,18 +352,6 @@ RUN ln -s "$(realpath --relative-to=/usr/local/bin "${TOOL_PATH_PWSH}")/pwsh" /u
 COPY --link --from=dotnet-powershell-modules /usr/local/share/powershell /usr/local/share/powershell
 COPY --link --from=dotnet-powershell-az-modules /usr/local/share/powershell /usr/local/share/powershell
 
-# add rust
-ARG CARGO_HOME=/etc/skel/.cargo
-COPY --link --from=rust ${CARGO_HOME} ${CARGO_HOME}
-ARG RUSTUP_HOME=/etc/skel/.rustup
-COPY --link --from=rust ${RUSTUP_HOME} ${RUSTUP_HOME}
-ENV PATH=${CARGO_HOME}/bin:${PATH} \
-    CARGO_HOME=${CARGO_HOME} \
-    RUSTUP_HOME=${RUSTUP_HOME}
-RUN sed "s|^PATH=|PATH=${CARGO_HOME}/bin:|mg" -i /etc/environment \
-    && echo "CARGO_HOME=${CARGO_HOME}" | tee -a /etc/environment \
-    && echo "RUSTUP_HOME=${RUSTUP_HOME}" | tee -a /etc/environment
-
 # upgrade and cleanup step
 RUN apt-get -y update \
     && apt-get -y upgrade \