v1.43.0

Author: joseluisq

docker/Dockerfile

@@ -1,5 +1,5 @@
-# NOTE: Most of Dockerfile and related files were borrowed from
-#       https://hub.docker.com/r/joseluisq/rust-linux-darwin-builder
+# NOTE: Most of Dockerfile and related were borrowed from
+#       https://hub.docker.com/r/ekidd/rust-musl-builder
 
 FROM debian:buster-slim
 
@@ -8,10 +8,21 @@ LABEL maintainer="Jose Quintana <git.io/joseluisq>"
 # The Rust toolchain to use when building our image. Set by `hooks/build`.
 ARG TOOLCHAIN=stable
 
-# The OpenSSL version to use. We parameterize this because many Rust
-# projects will fail to build with 1.1.
-# File: openssl-1.0.2u.tar.gz (2019-Dec-20 13:25:43)
-ARG OPENSSL_VERSION=1.0.2
+
+# Dependencies
+
+# OpenSSL v1.1.1
+ARG OPENSSL_VERSION=1.1.1g
+
+# zlib - http://zlib.net/
+ARG ZLIB_VERSION=1.2.11
+
+# libpq - https://ftp.postgresql.org/pub/source/
+ARG POSTGRESQL_VERSION=11.7
+
+# Mac OS X SDK version for OS X Cross
+ARG MACOSX_SDK_VERSION=10.11
+
 
 # Make sure we have basic dev tools for building C libraries. Our goal
 # here is to support the musl-libc builds and Cargo builds needed for a
@@ -47,35 +58,38 @@ RUN set -eux \
         zlib1g-dev \
 # Clean up local repository of retrieved packages and remove the package lists
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && true
 
 # Static linking for C++ code
 RUN set -eux \
     && ln -s "/usr/bin/g++" "/usr/bin/musl-g++" \
 # Create appropriate directories for current user
-    && mkdir -p /root/libs /root/src
+    && mkdir -p /root/libs /root/src \
+    && true
 
 # Set up our path with all our binary directories, including those for the
 # musl-gcc toolchain and for our Rust toolchain.
 ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-# Install our Rust toolchain and the `musl` target.  We patch the
+# Install our Rust toolchain and the `musl` target. We patch the
 # command-line we pass to the installer so that it won't attempt to
-# interact with the user or fool around with TTYs.  We also set the default
-# `--target` to musl so that our users don't need to keep overriding it
-# manually.
+# interact with the user or fool around with TTYs. We also set the default
+# `--target` to musl so that our users don't need to keep overriding it manually.
 RUN set -eux \
     && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN \
     && rustup target add x86_64-unknown-linux-musl \
     && rustup target add armv7-unknown-linux-musleabihf \
-    && rustup target add x86_64-apple-darwin
+    && rustup target add x86_64-apple-darwin \
+    && true
 ADD docker/cargo-config.toml /root/.cargo/config
 
 # Set up a `git credentials` helper for using GH_USER and GH_TOKEN to access
 # private repositories if desired.
 ADD docker/git-credential-ghtoken /usr/local/bin
 RUN set -eux \
-    && git config --global credential.https://github.com.helper ghtoken
+    && git config --global credential.https://github.com.helper ghtoken \
+    && true
 
 # Build a static library version of OpenSSL using musl-libc.  This is needed by
 # the popular Rust `hyper` crate.
@@ -87,47 +101,50 @@ RUN set -eux \
 RUN set -eux \
     && echo "Building OpenSSL..." \
     && ls /usr/include/linux \
-    && sudo mkdir -p /usr/local/musl/include \
-    && sudo ln -s /usr/include/linux /usr/local/musl/include/linux \
-    && sudo ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/musl/include/asm \
-    && sudo ln -s /usr/include/asm-generic /usr/local/musl/include/asm-generic \
+    && mkdir -p /usr/local/musl/include \
+    && ln -s /usr/include/linux /usr/local/musl/include/linux \
+    && ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/musl/include/asm \
+    && ln -s /usr/include/asm-generic /usr/local/musl/include/asm-generic \
     && cd /tmp \
-    && curl -LO "https://www.openssl.org/source/old/${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}u.tar.gz" \
-    && tar xvzf "openssl-${OPENSSL_VERSION}u.tar.gz" && cd "openssl-${OPENSSL_VERSION}u" \
+    && curl -LO "https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" \
+    && tar xvzf "openssl-$OPENSSL_VERSION.tar.gz" \
+    && cd "openssl-$OPENSSL_VERSION" \
     && env CC=musl-gcc ./Configure no-shared no-zlib -fPIC --prefix=/usr/local/musl -DOPENSSL_NO_SECURE_MEMORY linux-x86_64 \
     && env C_INCLUDE_PATH=/usr/local/musl/include/ make depend \
     && env C_INCLUDE_PATH=/usr/local/musl/include/ make \
-    && sudo make install \
-    && sudo rm /usr/local/musl/include/linux /usr/local/musl/include/asm /usr/local/musl/include/asm-generic \
-    && rm -r /tmp/*
+    && make install \
+    && rm /usr/local/musl/include/linux /usr/local/musl/include/asm /usr/local/musl/include/asm-generic \
+    && openssl version \
+    && rm -r /tmp/* \
+    && true
 
 RUN set -eux \
     && echo "Building zlib..." \
     && cd /tmp \
-    && ZLIB_VERSION=1.2.11 \
     && curl -LO "http://zlib.net/zlib-$ZLIB_VERSION.tar.gz" \
     && tar xzf "zlib-$ZLIB_VERSION.tar.gz" \
     && cd "zlib-$ZLIB_VERSION" \
-    && CC=musl-gcc ./configure --static --prefix=/usr/local/musl \
+    && env CC=musl-gcc ./configure --static --prefix=/usr/local/musl \
     && make \
-    && sudo make install \
-    && rm -r /tmp/*
+    && make install \
+    && rm -r /tmp/* \
+    && true
 
 RUN set -eux \
     && echo "Building libpq..." \
     && cd /tmp \
-    && POSTGRESQL_VERSION=11.2 \
     && curl -LO "https://ftp.postgresql.org/pub/source/v$POSTGRESQL_VERSION/postgresql-$POSTGRESQL_VERSION.tar.gz" \
     && tar xzf "postgresql-$POSTGRESQL_VERSION.tar.gz" \
     && cd "postgresql-$POSTGRESQL_VERSION" \
-    && CC=musl-gcc CPPFLAGS=-I/usr/local/musl/include LDFLAGS=-L/usr/local/musl/lib ./configure --with-openssl --without-readline --prefix=/usr/local/musl \
+    && env CC=musl-gcc CPPFLAGS=-I/usr/local/musl/include LDFLAGS=-L/usr/local/musl/lib ./configure --with-openssl --without-readline --prefix=/usr/local/musl \
     && cd src/interfaces/libpq \
     && make all-static-lib \
-    && sudo make install-lib-static \
+    && make install-lib-static \
     && cd ../../bin/pg_config \
     && make \
-    && sudo make install \
-    && rm -r /tmp/*
+    && make install \
+    && rm -r /tmp/* \
+    && true
 
 ENV OPENSSL_DIR=/usr/local/musl/ \
     OPENSSL_INCLUDE_DIR=/usr/local/musl/include/ \
@@ -145,22 +162,24 @@ ENV OPENSSL_DIR=/usr/local/musl/ \
 # libraries needed by the most popular and common Rust crates, to avoid
 # everybody needing to build them manually.)
 
-ENV OSXCROSS_SDK_VERSION 10.11
+
+# Install OS X Cross
+# A Mac OS X cross toolchain for Linux, FreeBSD, OpenBSD and Android
 
 RUN set -eux \
     && echo "Building osxcross..." \
     && cd /usr/local/ \
     && git clone --depth 1 https://github.com/tpoechtrager/osxcross \
     && cd osxcross \
-    && curl -L -o ./tarballs/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
-    https://s3.amazonaws.com/andrew-osx-sdks/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
+    && curl -L -o "./tarballs/MacOSX$MACOSX_SDK_VERSION.sdk.tar.xz" \
+        "https://s3.amazonaws.com/andrew-osx-sdks/MacOSX$MACOSX_SDK_VERSION.sdk.tar.xz" \
     && env UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh \
     && rm -rf *~ taballs *.tar.xz \
-    && rm -rf /tmp/*
+    && rm -rf /tmp/* \
+    && true
 
 ENV PATH $PATH:/usr/local/osxcross/target/bin
 
-# Expect our source code to live in /root/src
 WORKDIR /root/src
 
 CMD ["bash"]
@@ -170,5 +189,5 @@ LABEL org.opencontainers.image.vendor="Jose Quintana" \
     org.opencontainers.image.url="https://github.com/joseluisq/rust-linux-darwin-builder" \
     org.opencontainers.image.title="Rust Linux / Darwin Builder" \
     org.opencontainers.image.description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
-    org.opencontainers.image.version="v1.42.0" \
+    org.opencontainers.image.version="v1.43.0" \
     org.opencontainers.image.documentation="https://github.com/joseluisq/rust-linux-darwin-builder"