Build script improvements

Author: adityapk00

docker/Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 LABEL Description="Rust compile env for Linux + Windows (cross)"
 
 RUN apt update
-RUN apt install -y build-essential mingw-w64 gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf curl vim wget
+RUN apt install -y build-essential mingw-w64 gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf curl vim wget git
 
 # Get Rust
 RUN curl https://sh.rustup.rs -sSf | bash -s -- --default-toolchain none -y
@@ -33,13 +33,12 @@ ENV CC_armv7_unknown_linux_gnueabhihf="arm-linux-gnueabihf-gcc"
 RUN cd /opt && wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-mingw.tar.gz && \
     tar xvf libsodium-1.0.17-mingw.tar.gz     
 
-RUN apt install -y git
-
 # Cargo fetch the dependencies so we don't download them over and over again
 RUN cd /tmp && git clone --depth=1 https://github.com/adityapk00/zecwallet-light-cli.git && \
     cd zecwallet-light-cli && \
     cargo fetch && \
     cd /tmp && rm -rf zecwallet-light-cli
 
 # This is a bug fix for the windows cross compiler for Rust.
-RUN cp /usr/x86_64-w64-mingw32/lib/crt2.o  /root/.rustup/toolchains/1.46.0-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/crt2.o
+# RUN cp /usr/x86_64-w64-mingw32/lib/crt2.o  /root/.rustup/toolchains/1.49.0-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/crt2.o
+

mkrelease.sh

@@ -45,9 +45,6 @@ rm -rf target/macOS-zecwallet-cli-v$APP_VERSION
 mkdir -p target/macOS-zecwallet-cli-v$APP_VERSION
 cp target/release/zecwallet-cli target/macOS-zecwallet-cli-v$APP_VERSION/
 
-# For Windows and Linux, build via docker
-docker run --rm -v $(pwd)/:/opt/zecwallet-light-cli rustbuild:latest bash -c "cd /opt/zecwallet-light-cli && cargo build --release && cargo build --release --target armv7-unknown-linux-gnueabihf && cargo build --release --target aarch64-unknown-linux-gnu && SODIUM_LIB_DIR='/opt/libsodium-win64/lib/' cargo build --release --target x86_64-pc-windows-gnu"
-
 # Now sign and zip the binaries
 # macOS
 gpg --batch --output target/macOS-zecwallet-cli-v$APP_VERSION/zecwallet-cli.sig --detach-sig target/macOS-zecwallet-cli-v$APP_VERSION/zecwallet-cli 
@@ -58,6 +55,8 @@ cd ..
 zip -r macOS-zecwallet-cli-v$APP_VERSION.zip macOS-zecwallet-cli-v$APP_VERSION 
 cd ..
 
+# For Windows and Linux, build via docker
+docker run --rm -v $(pwd)/:/opt/zecwallet-light-cli rustbuild:latest bash -c "cd /opt/zecwallet-light-cli && cargo build --release && cargo build --release --target armv7-unknown-linux-gnueabihf && cargo build --release --target aarch64-unknown-linux-gnu && SODIUM_LIB_DIR='/opt/libsodium-win64/lib/' cargo build --release --target x86_64-pc-windows-gnu"
 
 #Linux
 rm -rf target/linux-zecwallet-cli-v$APP_VERSION