Combine the compiler Dockerfiles and use the Docker registry

Author: shepmaster

compiler/base/Dockerfile

@@ -17,3 +17,24 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y  && rustup toolchain uninstall
 ADD Cargo.toml /root/Cargo.toml
 ADD entrypoint.sh /root/
 ADD fix-modification-time.sh /root/
+
+# Now that we have set up our basic environment, let's set up the
+# specific channel.
+
+ARG channel
+ARG date
+RUN rustup default "${channel}-${date}"
+
+RUN cd / && \
+    cargo new playground
+
+WORKDIR /playground
+
+RUN mv /root/Cargo.toml ./Cargo.toml && \
+    cargo build && \
+    cargo build --release
+
+RUN find . -name '*.json' -print0 | xargs -0 -n1 /root/fix-modification-time.sh
+RUN rm src/*.rs
+
+ENTRYPOINT ["/root/entrypoint.sh"]

compiler/beta/Dockerfile

@@ -1,37 +1,62 @@
 #!/bin/bash
 
-set -eu -o pipefail
+set -euv -o pipefail
 
-cd base
-docker build -t 'rust-base' .
-cd ..
+channels_to_build="${CHANNELS_TO_BUILD-stable beta nightly}"
+tools_to_build="${TOOLS_TO_BUILD-rustfmt clippy}"
+perform_push="${PERFORM_PUSH-false}"
 
-date_url_base=https://static.rust-lang.org/dist
+repository=shepmaster
 
-for channel in stable beta nightly; do
-    filename="channel-rust-${channel}-date.txt"
+date_url_base=https://static.rust-lang.org/dist
 
-    cd "$channel"
+for channel in $channels_to_build; do
+    cd "base"
 
+    filename="channel-rust-${channel}-date.txt"
     curl -o "${filename}" "${date_url_base}/${filename}"
     date=$(cat "${filename}")
 
-    docker build -t "rust-${channel}" --build-arg date="${date}" .
+    image_name="rust-${channel}"
+    full_name="${repository}/${image_name}"
+
+    docker pull "${full_name}"
+    docker build -t "${full_name}" \
+           --cache-from "${full_name}" \
+           --build-arg channel="${channel}" \
+           --build-arg date="${date}" \
+           .
+    docker tag "${full_name}" "${image_name}"
+
+    if [[ "${perform_push}" == 'true' ]]; then
+        docker push "${full_name}"
+    fi
 
     cd ..
 done
 
 crate_api_base=https://crates.io/api/v1/crates
 
-for tool in rustfmt clippy; do
-    filename="version-${tool}.txt"
-
+for tool in $tools_to_build; do
     cd "${tool}"
 
+    filename="version-${tool}.txt"
     curl -o "${filename}" "${crate_api_base}/${tool}"
     version=$(jq -r '.crate.max_version' "${filename}")
 
-    docker build -t "${tool}" --build-arg version="${version}" .
+    image_name="${tool}"
+    full_name="${repository}/${image_name}"
+
+    docker pull "${full_name}"
+    docker build -t "${full_name}" \
+           --cache-from "${full_name}" \
+           --build-arg version="${version}" \
+           .
+    docker tag "${full_name}" "${image_name}"
+
+    if [[ "${perform_push}" == 'true' ]]; then
+        docker push "${full_name}"
+    fi
 
     cd ..
 done

compiler/build.sh

@@ -1,4 +1,4 @@
-FROM rust-nightly
+FROM shepmaster/rust-nightly
 
 ARG version
 

compiler/clippy/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust-stable
+FROM shepmaster/rust-stable
 
 ARG version