From d1bd6f5e79a7596fbf3534738fb2243fb7307aa3 Mon Sep 17 00:00:00 2001
From: Enzo Desiage <enzo.desiage@dfinity.org>
Date: Tue, 18 Apr 2023 17:15:56 +0000
Subject: [PATCH] IDX-2803 - Add Rust bazel docker image

---
 .devcontainer/devcontainer.json         |  2 +-
 gitlab-ci/config/00--common--images.yml |  4 ++--
 gitlab-ci/container/Dockerfile.bazel    | 15 +++++++++++++++
 gitlab-ci/container/TAG                 |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5dd6ff8f283..23df1bbd88e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "dfinity/ic-build-bazel:526a571034668a8aa9693b9294f9d09545ead14e2e478e26f4df03b5f0025e96",
+  "image": "dfinity/ic-build-bazel:5abdeaa1eb3b2bde348a4f495659445c096324815803f1e4b73b697fe7900521",
   "remoteUser": "ubuntu",
   "workspaceMount": "source=${localWorkspaceFolder},target=/ic,type=bind",
   "workspaceFolder": "/ic",
diff --git a/gitlab-ci/config/00--common--images.yml b/gitlab-ci/config/00--common--images.yml
index c902e091230..f35ad283453 100644
--- a/gitlab-ci/config/00--common--images.yml
+++ b/gitlab-ci/config/00--common--images.yml
@@ -4,7 +4,7 @@
   artifacts:
     expire_in: 3 days
   image:
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:526a571034668a8aa9693b9294f9d09545ead14e2e478e26f4df03b5f0025e96"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build:5abdeaa1eb3b2bde348a4f495659445c096324815803f1e4b73b697fe7900521"
   tags:
     - dfinity-ic
   variables:
@@ -14,7 +14,7 @@
   artifacts:
     expire_in: 3 days
   image:
-    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-bazel:526a571034668a8aa9693b9294f9d09545ead14e2e478e26f4df03b5f0025e96"
+    name: "registry.gitlab.com/dfinity-lab/core/docker/ic-build-bazel:5abdeaa1eb3b2bde348a4f495659445c096324815803f1e4b73b697fe7900521"
   tags:
     - dfinity-ic
   variables:
diff --git a/gitlab-ci/container/Dockerfile.bazel b/gitlab-ci/container/Dockerfile.bazel
index ab8e6037143..dfad6486e14 100644
--- a/gitlab-ci/container/Dockerfile.bazel
+++ b/gitlab-ci/container/Dockerfile.bazel
@@ -64,5 +64,20 @@ COPY ./files/containers.conf /etc/containers/containers.conf
 COPY ./files/docker.sh /usr/bin/docker
 COPY ./files/entrypoint.sh /entrypoint.sh
 
+# Install Rust and Cargo in /opt
+ENV RUSTUP_HOME=/opt/rustup \
+    CARGO_TARGET_DIR=/cargo_target \
+    PATH=/opt/cargo/bin:$PATH
+
+# Add Rust/Cargo support
+# rustup uses $CARGO_HOME to figure out where to install itself
+ARG rust_version=1.58.1
+ENV CARGO_HOME=/opt/cargo
+RUN curl --fail https://sh.rustup.rs -sSf \
+        | sh -s -- -y --default-toolchain ${rust_version}-x86_64-unknown-linux-gnu --no-modify-path && \
+    rustup default ${rust_version}-x86_64-unknown-linux-gnu && \
+    rustup target add wasm32-unknown-unknown && \
+    chown -R ${USER}.${USER} ${RUSTUP_HOME} ${CARGO_HOME}
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/gitlab-ci/container/TAG b/gitlab-ci/container/TAG
index e0bad444e54..f397d6b9aa1 100644
--- a/gitlab-ci/container/TAG
+++ b/gitlab-ci/container/TAG
@@ -1 +1 @@
-526a571034668a8aa9693b9294f9d09545ead14e2e478e26f4df03b5f0025e96
+5abdeaa1eb3b2bde348a4f495659445c096324815803f1e4b73b697fe7900521