From 172c78c41d95ec907e8e3cc990489c814078ddaf Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Tue, 3 Jan 2023 18:05:34 +0900
Subject: [PATCH] Update Dockerfile for CI

---
 .circleci/config.yml                           | 2 +-
 .circleci/images/plume-buildenv/Dockerfile     | 3 ++-
 .circleci/images/plume-buildenv/rust-toolchain | 2 +-
 script/prebuild-in-docker.sh                   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5ac952d..f528041e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ executors:
         type: boolean
         default: false
     docker:
-    - image: plumeorg/plume-buildenv:v0.7.0
+    - image: plumeorg/plume-buildenv:v0.8.0
     - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile
index 216b30e1..ceafef65 100644
--- a/.circleci/images/plume-buildenv/Dockerfile
+++ b/.circleci/images/plume-buildenv/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1-buster
+FROM rust:1
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 #install native/circleci/build dependancies
@@ -14,6 +14,7 @@ RUN apt update &&\
 
 #stick rust environment
 COPY rust-toolchain ./
+RUN rustup component add rustfmt clippy
 
 #compile some deps
 RUN cargo install wasm-pack &&\
diff --git a/.circleci/images/plume-buildenv/rust-toolchain b/.circleci/images/plume-buildenv/rust-toolchain
index 63af764b..b57117c9 100644
--- a/.circleci/images/plume-buildenv/rust-toolchain
+++ b/.circleci/images/plume-buildenv/rust-toolchain
@@ -1 +1 @@
-nightly-2022-01-27
+nightly-2022-07-19
diff --git a/script/prebuild-in-docker.sh b/script/prebuild-in-docker.sh
index 64171e5c..766930ab 100755
--- a/script/prebuild-in-docker.sh
+++ b/script/prebuild-in-docker.sh
@@ -3,4 +3,4 @@ set -euo pipefail
 
 version="$1"
 
-docker run --rm -v $PWD:/repo -v $PWD/pkg:/pkg -v $PWD/script/prebuild.sh:/prebuild.sh plumeorg/plume-buildenv:v0.4.0 /prebuild.sh "$version" /repo /prebuild /pkg
+docker run --rm -v $PWD:/repo -v $PWD/pkg:/pkg -v $PWD/script/prebuild.sh:/prebuild.sh plumeorg/plume-buildenv:v0.7.0 /prebuild.sh "$version" /repo /prebuild /pkg