Use cache volume

.github/workflows/docker.yml

@@ -37,10 +37,10 @@ jobs:
         env:
           DOCKER_PORT: 4000
 
-      - name: Sleep for 120s, allow Docker image to boot up
+      - name: Sleep for 300s, allow Docker image to boot up
         uses: juliangruber/sleep-action@v1
         with:
-          time: 120s
+          time: 300s
 
       - name: Install docker-tests
         run: yarn workspace docker-tests install

.github/workflows/rust.yml

@@ -55,8 +55,12 @@ jobs:
       - name: Build
         run: cargo build --verbose
       - name: Pull docker image
-        run: docker pull docker.io/achimcc/ink-compiler:latest
+        run: docker pull docker.io/paritytech/ink-ci-linux:production
       - name: Tag docker image
-        run: docker tag docker.io/achimcc/ink-compiler:latest ink-compiler
+        run: docker tag docker.io/paritytech/ink-ci-linux:production ink-compiler
+      - name: Copy contract folder
+        run: mkdir ./builds && cp -R crates/contract ./builds/contract
+      - name: pre-build compilation cache
+        run: docker run --volume cache:/usr/local/cargo/registry --volume ${GITHUB_WORKSPACE}/builds:/builds --workdir /builds/contract/ ink-compiler cargo contract build --release
       - name: Run tests
         run: cargo test --workspace --exclude rust_analyzer_wasm --verbose

Dockerfile

@@ -124,6 +124,9 @@ RUN apt-get --yes install docker-ce docker-ce-cli \
 COPY sysbox/on-start.sh /usr/bin
 RUN chmod +x /usr/bin/on-start.sh
 
+RUN mkdir /builds
+COPY crates/contract /builds/contract
+
 # Entrypoint
 
 ENTRYPOINT [ "on-start.sh" ]

Makefile

@@ -243,8 +243,9 @@ docker-shell:
 	  --runtime=sysbox-runc \
 	  -it \
 	  --volume /tmp:/tmp \
+	  --volume cache:/cache \
 	  --entrypoint /bin/bash \
-	  --publish $(DOCKER_PORT):4000 \
+	  --publish 5000:4000 \
 	  ink-playground
 
 docker-log:

crates/contract/Cargo.toml

@@ -1,23 +1,20 @@
 [package]
 name = "contract"
-version = "4.0.0-alpha.3"
+version = "4.0.0-beta"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.0.0-alpha.3", default-features = false }
+ink = { version = "4.0.0-beta", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
-scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
+scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 
 [lib]
 name = "contract"
 path = "lib.rs"
-crate-type = [
-        # Used for normal contract Wasm blobs.
-        "cdylib",
-]
+crate-type = ["cdylib"]
 
 [features]
 default = ["std"]

crates/sandbox/src/build_command.rs

@@ -104,6 +104,10 @@ fn build_basic_secure_docker_command() -> Command {
         DOCKER_WORKDIR,
         "--net",
         "none",
+        "--volume",
+        "cache:/usr/local/cargo/registry:ro",
+        "--volume",
+        "/builds:/builds",
         "--memory",
         "1024m",
         "--memory-swap",
@@ -131,7 +135,7 @@ fn build_execution_command() -> Vec<String> {
         "rm -rf {}/contract.* {}/metadata.json",
         target_dir, target_dir
     );
-    let build_cmd = "cargo contract build --offline 2>&1".to_string();
+    let build_cmd = "cargo contract build --release --offline 2>&1".to_string();
     let move_cmd = format!("mv {}/contract.contract {}", target_dir, DOCKER_OUTPUT);
 
     let command = format!("{} && {} && {}", clean_cmd, build_cmd, move_cmd);

sysbox/on-start.sh

@@ -5,9 +5,12 @@ dockerd > /var/log/dockerd.log 2>&1 &
 sleep 2
 
 # pull inner images
-docker pull achimcc/ink-compiler:latest
-docker tag achimcc/ink-compiler ink-compiler
+docker pull paritytech/ink-ci-linux:production
+docker tag paritytech/ink-ci-linux:production ink-compiler
 
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo clean
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract build --release
+docker run --volume cache:/usr/local/cargo/registry --volume /builds:/builds --workdir /builds/contract/  ink-compiler cargo contract test
 # start backend server
 /app/target/release/backend --port 4000 --host 0.0.0.0 --frontend_folder /app/packages/playground/dist