git.delta.rocks / unique-network / refs/commits / 3f1f974441e7

difftreelog

Merge pull request #13 from usetech-llc/feature/update_docker

str-mv2020-11-02parents: #3370e8a #b095ad2.patch.diff
in: master
Update toolchain and split into multiple build steps

2 files changed

modified.dockerignorediffbeforeafterboth
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,4 @@
 doc/
 target/
 chain-data*/
-smart_contract/
\ No newline at end of file
+smart_contract/
modifiedDockerfilediffbeforeafterboth
before · Dockerfile
1# ===== BUILD ======23FROM phusion/baseimage:0.10.2 as builder4LABEL maintainer="gz@usetech.com"56ENV WASM_TOOLCHAIN=nightly-2020-05-0178ARG PROFILE=release910RUN apt-get update && \11	apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \12	apt-get install -y cmake pkg-config libssl-dev git clang1314# Get project and run it15#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain16RUN mkdir nft_parachain17WORKDIR /nft_parachain18COPY . .1920RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \21	export PATH="$PATH:$HOME/.cargo/bin" && \22	rustup toolchain uninstall $(rustup toolchain list) && \23	rustup default 1.44.0 && \24	rustup toolchain install $WASM_TOOLCHAIN && \25	rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show && \28	cargo build "--$PROFILE" 29	# && \30	# cargo test3132RUN cd target/release && ls -la3334# ===== RUN ======3536FROM phusion/baseimage:0.10.237ARG PROFILE=release3839COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin4041EXPOSE 994442VOLUME ["/chain-data"]4344# Copy and run start script45COPY ["./run.sh", "./run.sh"]46RUN chmod +x ./run.sh47CMD ["bash", "-c", "./run.sh"]
after · Dockerfile
1# ===== BUILD ======23FROM phusion/baseimage:0.10.2 as builder4LABEL maintainer="gz@usetech.com"56ENV WASM_TOOLCHAIN=nightly-2020-10-0178ARG PROFILE=release910RUN apt-get update && \11	apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \12	apt-get install -y cmake pkg-config libssl-dev git clang1314# Get project and run it15#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain16RUN mkdir nft_parachain17WORKDIR /nft_parachain18COPY . .1920RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y21RUN export PATH="/cargo-home/bin:$PATH" && \22    export CARGO_HOME="/cargo-home" && \23	cargo fetch24RUN export PATH="/cargo-home/bin:$PATH" && \25    export CARGO_HOME="/cargo-home" && \26	rustup toolchain uninstall $(rustup toolchain list) && \27	rustup toolchain install $WASM_TOOLCHAIN && \28	rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \29    rustup target list --installed && \30    rustup show3132RUN export PATH="/cargo-home/bin:$PATH" && \33    export CARGO_HOME="/cargo-home" && \34	cargo +$WASM_TOOLCHAIN build "--$PROFILE"35	# && \36	# cargo test3738# ===== RUN ======3940FROM phusion/baseimage:0.10.241ARG PROFILE=release4243COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin4445EXPOSE 994446VOLUME ["/chain-data"]4748# Copy and run start script49COPY ["./run.sh", "./run.sh"]50RUN chmod +x ./run.sh51CMD ["bash", "-c", "./run.sh"]