From c417d521f2c1133ef7a7480195b2ab9e3aadbef1 Mon Sep 17 00:00:00 2001
From: clearloop <mercuryfletcher@gmail.com>
Date: Tue, 16 Nov 2021 10:39:58 +0800
Subject: [PATCH 1/2] feat(docker): use polkadot-v0.9.12 image directly

---
 docker/launch.Dockerfile |  2 +-
 docker/rococo.Dockerfile | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 docker/rococo.Dockerfile

diff --git a/docker/launch.Dockerfile b/docker/launch.Dockerfile
index f7ef45c5c0..acdd081791 100644
--- a/docker/launch.Dockerfile
+++ b/docker/launch.Dockerfile
@@ -8,7 +8,7 @@ FROM debian:buster-slim
 COPY config.json config.json
 COPY js/polkadot-launch polkadot-launch
 COPY --from=chainsafe/pint /usr/local/bin/pint bin/
-COPY --from=clearloop/rococo-v1 /polkadot bin/
+COPY --from=parity/polkadot:v0.9.12 /usr/bin/polkadot bin/
 COPY --from=clearloop/statemint /statemint bin/
 ENV CARGO_TERM_COLOR=always
 RUN apt-get update -y \
diff --git a/docker/rococo.Dockerfile b/docker/rococo.Dockerfile
deleted file mode 100644
index abe1ca8441..0000000000
--- a/docker/rococo.Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# syntax=docker/dockerfile:experimental
-#
-# Copyright 2021 ChainSafe Systems
-# SPDX-License-Identifier: LGPL-3.0-only
-#
-# rococo-v1
-FROM paritytech/ci-linux:production as builder
-COPY . .
-ENV CARGO_TERM_COLOR=always
-RUN --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    --mount=type=cache,sharing=private,target=target \
-    git clone https://github.com/paritytech/polkadot.git -b rococo-v1 --depth=1 \
-    && cd polkadot \
-    && cargo build --release \
-    && mv target/release/polkadot /polkadot
-
-# Only a binary for debian
-FROM scratch
-COPY --from=builder /polkadot /

From 88a3e63745ba440b3c19b0411c41f5a4e1a094df Mon Sep 17 00:00:00 2001
From: clearloop <mercuryfletcher@gmail.com>
Date: Tue, 16 Nov 2021 14:55:13 +0800
Subject: [PATCH 2/2] feat(docker): remove statemint dockerfile

---
 .gitmodules                 |  2 +-
 config.json                 | 14 --------------
 docker/launch.Dockerfile    |  1 -
 docker/statemint.Dockerfile | 20 --------------------
 js/polkadot-launch          |  2 +-
 5 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 docker/statemint.Dockerfile

diff --git a/.gitmodules b/.gitmodules
index 4fdc6a499b..58281afa87 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "js/polkadot-launch"]
 	path = js/polkadot-launch
-	url = https://github.com/paritytech/polkadot-launch.git
+	url = https://github.com/ChainSafe/polkadot-launch.git
diff --git a/config.json b/config.json
index 4fb41c94d1..546100ca80 100644
--- a/config.json
+++ b/config.json
@@ -39,20 +39,6 @@
           ]
         }
       ]
-    },
-    {
-      "bin": "./bin/statemint",
-      "chain": "statemint-dev",
-      "id": "300",
-      "balance": "1000000000000000000000",
-      "nodes": [
-        {
-          "wsPort": 9999,
-          "port": 31300,
-          "name": "alice",
-          "flags": ["--force-authoring", "--", "--execution=wasm"]
-        }
-      ]
     }
   ],
   "simpleParachains": [],
diff --git a/docker/launch.Dockerfile b/docker/launch.Dockerfile
index acdd081791..9f4268ad1b 100644
--- a/docker/launch.Dockerfile
+++ b/docker/launch.Dockerfile
@@ -9,7 +9,6 @@ COPY config.json config.json
 COPY js/polkadot-launch polkadot-launch
 COPY --from=chainsafe/pint /usr/local/bin/pint bin/
 COPY --from=parity/polkadot:v0.9.12 /usr/bin/polkadot bin/
-COPY --from=clearloop/statemint /statemint bin/
 ENV CARGO_TERM_COLOR=always
 RUN apt-get update -y \
     && apt-get install openssl curl git -y \
diff --git a/docker/statemint.Dockerfile b/docker/statemint.Dockerfile
deleted file mode 100644
index ae43ba8e5f..0000000000
--- a/docker/statemint.Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# syntax=docker/dockerfile:experimental
-#
-# Copyright 2021 ChainSafe Systems
-# SPDX-License-Identifier: LGPL-3.0-only
-#
-# statemint
-FROM paritytech/ci-linux:production as builder
-COPY . .
-ENV CARGO_TERM_COLOR=always
-RUN --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    --mount=type=cache,sharing=private,target=target \
-    git clone https://github.com/paritytech/statemint.git --depth=1 \
-    && cd statemint \
-    && cargo build --release \
-    && mv target/release/statemilnt /statemint
-
-# Only a binary for debian
-FROM scratch
-COPY --from=builder /statemint /
diff --git a/js/polkadot-launch b/js/polkadot-launch
index 9abb6d72f5..8f2b728a15 160000
--- a/js/polkadot-launch
+++ b/js/polkadot-launch
@@ -1 +1 @@
-Subproject commit 9abb6d72f56ed4f10cd7d9c5131566ffa87bd52d
+Subproject commit 8f2b728a15949b8f7e3830d6da2d12c3e599198f