chore: split up dockerfiles

Author: joseluisq

.github/workflows/devel.yml

@@ -77,7 +77,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-          file: docker/amd64/Dockerfile
+          file: docker/amd64/base/Dockerfile
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -107,8 +107,8 @@ jobs:
               cat /etc/debian_version
               uname -a
               make test-app
-              make test-zlib
-              make test-openssl
+              # make test-zlib
+              # make test-openssl
       -
         # Temp fix
         # https://github.com/docker/build-push-action/issues/252
@@ -178,7 +178,7 @@ jobs:
         with:
           context: .
           platforms: linux/arm64
-          file: docker/arm64/Dockerfile
+          file: docker/arm64/base/Dockerfile
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -208,8 +208,8 @@ jobs:
               cat /etc/debian_version
               uname -a
               make test-app
-              make test-zlib
-              make test-openssl
+              # make test-zlib
+              # make test-openssl
       -
         # Temp fix
         # https://github.com/docker/build-push-action/issues/252

Makefile

@@ -1,61 +1,104 @@
-REPOSITORY ?= joseluisq
-TAG ?= latest
+REPOSITORY ?= joseluisq/rust-linux-darwin-builder
+TAG ?= devel
 
-build-amd64:
-	docker build \
-		-t $(REPOSITORY)/rust-linux-darwin-builder:$(TAG)-amd64 \
+# AMD64 Tasks
+
+amd64-build:
+	docker buildx build \
+		-t $(REPOSITORY):$(TAG)-amd64 \
 		--network=host \
-		-f docker/amd64/Dockerfile .
-.PHONY: build-amd64
+		--platform linux/amd64 \
+		-f docker/amd64/base/Dockerfile .
+.PHONY: amd64-build
 
-run-amd64:
+amd64-run:
 	@docker run --rm -it \
 		-v $(PWD):/root/src \
-		-v $(PWD)/docker/amd64/cargo.toml:/root/.cargo/config.toml \
+		-v $(PWD)/docker/amd64/base/cargo.toml:/root/.cargo/config.toml \
 		-w /root/src \
-			$(REPOSITORY)/rust-linux-darwin-builder:$(TAG)-amd64 \
+			$(REPOSITORY):$(TAG)-amd64 \
 				bash
-.PHONY: run-amd64
+.PHONY: amd64-run
+
+amd64-test:
+	@docker run --rm \
+		-v $(PWD):/root/src \
+		-w /root/src \
+			$(REPOSITORY):$(TAG)-amd64 \
+				bash -c 'set -eu; test-app'
+.PHONY: amd64-test
 
-build-arm64:
+amd64-build-libs:
 	docker buildx build \
-		-t $(REPOSITORY)/rust-linux-darwin-builder:$(TAG)-arm64 \
+		-t $(REPOSITORY):$(TAG)-amd64-libs \
 		--network=host \
-		--platform linux/arm64 \
-		-f docker/arm64/Dockerfile .
-.PHONY: build-arm64
+		--platform linux/amd64 \
+		-f docker/amd64/libs/Dockerfile .
+.PHONY: amd64-build-libs
 
-run-arm64:
+amd64-run-libs:
 	@docker run --rm -it \
 		-v $(PWD):/root/src \
-		-v $(PWD)/docker/arm64/cargo.toml:/root/.cargo/config.toml \
+		-v $(PWD)/docker/amd64/libs/cargo.toml:/root/.cargo/config.toml \
 		-w /root/src \
-			$(REPOSITORY)/rust-linux-darwin-builder:$(TAG)-arm64 \
+			$(REPOSITORY):$(TAG)-amd64-libs \
 				bash
-.PHONY: run-arm64
+.PHONY: amd64-run-libs
 
-# Use to build both arm64 and amd64 images at the same time.
-# WARNING! Will automatically push, since multi-platform images are not available locally.
-# Use `REPOSITORY` arg to specify which container repository to push the images to.
-buildx:
-	docker run --privileged --rm tonistiigi/binfmt --install linux/amd64,linux/arm64
-	docker buildx create --name darwin-builder --driver docker-container --bootstrap
-	docker buildx use darwin-builder
+amd64-test-libs:
+	@docker run --rm \
+		-v $(PWD):/root/src \
+		-w /root/src \
+			$(REPOSITORY):$(TAG)-amd64-libs \
+				bash -c 'set -eu; test-all'
+.PHONY: amd64-test-libs
+
+
+# ARM64 Tasks
+
+arm64-build:
 	docker buildx build \
-		--platform linux/amd64,linux/arm64 \
-		--push \
-		-t $(REPOSITORY)/rust-linux-darwin-builder:$(TAG) \
-		-f Dockerfile .
+		-t $(REPOSITORY):$(TAG)-arm64 \
+		--network=host \
+		--platform linux/arm64 \
+		-f docker/arm64/base/Dockerfile .
+.PHONY: arm64-build
 
-.PHONY: buildx
+arm64-test:
+	@docker run --rm \
+		-v $(PWD):/root/src \
+		-w /root/src \
+			$(REPOSITORY):$(TAG)-arm64 \
+				bash -c 'set -eu; test-app'
+.PHONY: arm64-test
 
-test:
+arm64-build-libs:
+	docker buildx build \
+		-t $(REPOSITORY):$(TAG)-arm64-libs \
+		--network=host \
+		--platform linux/arm64 \
+		-f docker/arm64/libs/Dockerfile .
+.PHONY: arm64-build-libs
+
+arm64-run-libs:
+	@docker run --rm -it \
+		-v $(PWD):/root/src \
+		-v $(PWD)/docker/arm64/libs/cargo.toml:/root/.cargo/config.toml \
+		-w /root/src \
+			$(REPOSITORY):$(TAG)-arm64-libs \
+				bash
+.PHONY: arm64-run-libs
+
+arm64-test-libs:
 	@docker run --rm \
 		-v $(PWD):/root/src \
 		-w /root/src \
-			$(REPOSITORY)/rust-linux-darwin-builder:$(TAG) \
-				bash -c 'set -eu; make test-app; make test-zlib; make test-openssl'
-.PHONY: test
+			$(REPOSITORY):$(TAG)-arm64-libs \
+				bash -c 'set -eu; test-all'
+.PHONY: arm64-test-libs
+
+
+# Testing Tasks (inside the container)
 
 test-all: test-app test-zlib test-openssl
 .PHONY: test-all
@@ -176,8 +219,7 @@ test-zlib:
 			cargo build -v --release --target aarch64-apple-darwin \
 		&& du -sh target/aarch64-apple-darwin/release/zlib-test \
 		&& file target/aarch64-apple-darwin/release/zlib-test \
-		&& echo \
-
+		&& echo
 .ONESHELL: test-zlib
 
 test-openssl:
@@ -243,5 +285,18 @@ test-openssl:
 		&& du -sh target/aarch64-apple-darwin/release/openssl-test \
 		&& file target/aarch64-apple-darwin/release/openssl-test \
 		&& echo
-
 .ONESHELL: test-openssl
+
+# Use to build both arm64 and amd64 images at the same time.
+# WARNING! Will automatically push, since multi-platform images are not available locally.
+# Use `REPOSITORY` arg to specify which container repository to push the images to.
+buildx:
+	docker run --privileged --rm tonistiigi/binfmt --install linux/amd64,linux/arm64
+	docker buildx create --name darwin-builder --driver docker-container --bootstrap
+	docker buildx use darwin-builder
+	docker buildx build \
+		--platform linux/amd64,linux/arm64 \
+		--push \
+		-t $(REPOSITORY):$(TAG) \
+		-f Dockerfile .
+.PHONY: buildx

docker/amd64/base/Dockerfile

@@ -0,0 +1,51 @@
+FROM joseluisq/docker-osxcross:1.0.0-beta.2
+
+ARG VERSION=0.0.0
+ENV VERSION=${VERSION}
+
+# Rust stable toolchain
+ARG TOOLCHAIN=1.87.0
+
+LABEL version="${VERSION}" \
+    description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
+    maintainer="Jose Quintana <joseluisq.net>"
+
+# 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 \
+    && true
+
+ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
+
+##### Rust toolchains
+
+# Rust/Cargo related environment variables
+ENV TARGET=musl
+
+# pkg-config related environment variables
+ENV PKG_CONFIG_ALLOW_CROSS=1
+ENV PKG_CONFIG_ALL_STATIC=1
+
+RUN set -eux \
+    && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TOOLCHAIN \
+    && rustup target add \
+        aarch64-apple-darwin \
+        aarch64-unknown-linux-gnu \
+        aarch64-unknown-linux-musl \
+        x86_64-apple-darwin \
+        x86_64-unknown-linux-musl \
+        x86_64-unknown-linux-gnu \
+    && true
+
+COPY docker/amd64/base/cargo.toml /root/.cargo/config.toml
+
+RUN set -eux \
+    && rustc -vV \
+    && cargo -vV \
+    && true
+
+WORKDIR /root/src
+
+CMD ["bash"]

docker/amd64/cargo.toml renamed to docker/amd64/base/cargo.toml

@@ -1,50 +1,4 @@
-FROM joseluisq/docker-osxcross:1.0.0-beta.2
-
-ARG VERSION=0.0.0
-ENV VERSION=${VERSION}
-
-LABEL version="${VERSION}" \
-    description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
-    maintainer="Jose Quintana <joseluisq.net>"
-
-# 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 \
-    && true
-
-ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
-
-##### Rust toolchains
-
-# Rust/Cargo related environment variables
-ENV TARGET=musl
-# Crate-related environment variables
-ENV LIBZ_SYS_STATIC=1
-
-# Rust stable toolchain
-ARG TOOLCHAIN=1.87.0
-
-RUN set -eux \
-    && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TOOLCHAIN \
-    && rustup target add \
-        aarch64-apple-darwin \
-        aarch64-unknown-linux-gnu \
-        aarch64-unknown-linux-musl \
-        x86_64-apple-darwin \
-        x86_64-unknown-linux-musl \
-        x86_64-unknown-linux-gnu \
-    && true
-
-COPY docker/amd64/cargo.toml /root/.cargo/config.toml
-
-RUN set -eux \
-    && rustc -vV \
-    && cargo -vV \
-    && true
-
-##### Libraries
+FROM joseluisq/rust-linux-darwin-builder:v2.0.0-beta.1
 
 RUN set -eux \
     && dpkg --add-architecture arm64 \
@@ -61,6 +15,8 @@ RUN set -eux \
 
 # zlib - http://zlib.net/
 ARG ZLIB_VERSION=1.3.1
+# Crate-related environment variables
+ENV LIBZ_SYS_STATIC=1
 
 WORKDIR /tmp
 
@@ -250,12 +206,6 @@ RUN set -eux \
     && rm -rf /tmp/* \
     && true
 
-WORKDIR /root
-
-# pkg-config related environment variables
-ENV PKG_CONFIG_ALLOW_CROSS=true
-ENV PKG_CONFIG_ALL_STATIC=true
-
 # OpenSSL related environment variables
 ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
 ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
@@ -268,5 +218,3 @@ ENV AARCH64_UNKNOWN_LINUX_GNU_OPENSSL_DIR=/usr/local/aarch64-linux-gnu
 ENV AARCH64_APPLE_DARWIN_OPENSSL_DIR=/usr/local/aarch64-apple-darwin
 
 WORKDIR /root/src
-
-CMD ["bash"]

docker/amd64/Dockerfile renamed to docker/amd64/libs/Dockerfile

@@ -0,0 +1,51 @@
+FROM joseluisq/docker-osxcross:1.0.0-beta.1
+
+ARG VERSION=0.0.0
+ENV VERSION=${VERSION}
+
+# Rust stable toolchain
+ARG TOOLCHAIN=1.87.0
+
+LABEL version="${VERSION}" \
+    description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
+    maintainer="Jose Quintana <joseluisq.net>"
+
+# 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 \
+    && true
+
+ENV PATH=/root/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
+
+##### Rust toolchains
+
+# Rust/Cargo related environment variables
+ENV TARGET=musl
+
+# pkg-config related environment variables
+ENV PKG_CONFIG_ALLOW_CROSS=1
+ENV PKG_CONFIG_ALL_STATIC=1
+
+RUN set -eux \
+    && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TOOLCHAIN \
+    && rustup target add \
+        aarch64-apple-darwin \
+        aarch64-unknown-linux-gnu \
+        aarch64-unknown-linux-musl \
+        x86_64-apple-darwin \
+        x86_64-unknown-linux-musl \
+        x86_64-unknown-linux-gnu \
+    && true
+
+COPY docker/arm64/base/cargo.toml /root/.cargo/config.toml
+
+RUN set -eux \
+    && rustc -vV \
+    && cargo -vV \
+    && true
+
+WORKDIR /root/src
+
+CMD ["bash"]