Browse Source

update docker build

Mokhtar Naamani 5 years ago
parent
commit
2871d6dd75
3 changed files with 3 additions and 4 deletions
  1. 1 1
      build-with-docker.sh
  2. 1 2
      runtime_dockerfile
  3. 1 1
      wasm_dockerfile

+ 1 - 1
build-with-docker.sh

@@ -10,7 +10,7 @@ docker build --tag runtime-build --file ./runtime_dockerfile .
 # Create a non running container from the runtime build image
 docker create --name runtime-container runtime-build
 # Copy the compiled wasm blob from the docker container to our host
-docker cp runtime-container:/runtime/wasm/target/wasm32-unknown-unknown/release/joystream_node_runtime_wasm.compact.wasm joystream_runtime.wasm
+docker cp runtime-container:/runtime/target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm joystream_runtime.wasm
 docker rm runtime-container
 
 # compute blake2_256 hash of the wasm blob - this should match the hash computed when the runtime file is

+ 1 - 2
runtime_dockerfile

@@ -11,7 +11,6 @@ RUN rustup show
 # Ensure clean build
 RUN cargo clean
 RUN rm -fr target/
-RUN rm -fr wasm/target/
 
 # Build the runtime
-RUN cargo test && ./build.sh
+RUN cargo test && cargo build --release

+ 1 - 1
wasm_dockerfile

@@ -1,4 +1,4 @@
-FROM liuchong/rustup:1.34.0 AS builder
+FROM liuchong/rustup:1.37.0 AS builder
 LABEL description="Joystream wasm toolchain image"
 
 ENV TERM=xterm