fix(devnet): Docker images creation with CI mode

Author: jpraynaud

mithril-aggregator/Dockerfile.ci

@@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM
 # Build-time platform architecture
 ARG TARGETARCH
 
+# Upgrade
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Create appuser
 RUN adduser --no-create-home --disabled-password appuser
 
 # Precreate workdir
 RUN mkdir -p /app/bin
 
-# Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
-
 # Install cardano-cli
 ARG CARDANO_NODE_VERSION=10.5.1
 ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/$CARDANO_NODE_VERSION/cardano-node-$CARDANO_NODE_VERSION-linux.tar.gz

mithril-aggregator/Makefile

@@ -8,6 +8,25 @@ build:
 	${CARGO} build --release
 	cp ../target/release/mithril-aggregator .
 
+build-ci:
+	# Check that we are on Linux, then build
+	if [ "$$(uname -s)" != "Linux" ]; then \
+		echo "Error: this target only supports Linux"; \
+		exit 1; \
+	fi; \
+	RAW_ARCH=$$(uname -m); \
+	if [ "$$RAW_ARCH" = "x86_64" ]; then \
+		ARCH="amd64"; \
+	elif [ "$$RAW_ARCH" = "aarch64" ]; then \
+		ARCH="arm64"; \
+	else \
+		echo "Error: unsupported architecture $$RAW_ARCH"; \
+		exit 1; \
+	fi; \
+	${CARGO} build --release; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-aggregator ./bin-linux-$${ARCH}/mithril-aggregator
+
 run: build
 	./mithril-aggregator serve
 
@@ -31,7 +50,7 @@ doc:
 docker-build:
 	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile .
 
-docker-build-ci: build
+docker-build-ci: build-ci
 	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION .
 
 docker-run:

mithril-client-cli/Dockerfile.ci

@@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM
 # Build-time platform architecture
 ARG TARGETARCH
 
+# Upgrade
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Create appuser
 RUN adduser --disabled-password appuser
 
 # Precreate workdir
 RUN mkdir -p /app/bin
 
-# Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
-
 # Copy the executable
 COPY mithril-client-cli/bin-linux-$TARGETARCH/mithril-client /app/bin/mithril-client
 

mithril-client-cli/Makefile

@@ -13,6 +13,25 @@ build:
 	${CARGO} build --release
 	cp ../target/release/mithril-client .
 
+build-ci:
+	# Check that we are on Linux, then build
+	if [ "$$(uname -s)" != "Linux" ]; then \
+		echo "Error: this target only supports Linux"; \
+		exit 1; \
+	fi; \
+	RAW_ARCH=$$(uname -m); \
+	if [ "$$RAW_ARCH" = "x86_64" ]; then \
+		ARCH="amd64"; \
+	elif [ "$$RAW_ARCH" = "aarch64" ]; then \
+		ARCH="arm64"; \
+	else \
+		echo "Error: unsupported architecture $$RAW_ARCH"; \
+		exit 1; \
+	fi; \
+	${CARGO} build --release; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-client ./bin-linux-$${ARCH}/mithril-client
+
 run: build
 	@./mithril-client $(call args,defaultstring)
 
@@ -39,7 +58,7 @@ doc:
 docker-build:
 	cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile .
 
-docker-build-ci: build
+docker-build-ci: build-ci
 	cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM .
 
 docker-run:

mithril-signer/Dockerfile.ci

@@ -7,15 +7,15 @@ FROM $DOCKER_IMAGE_FROM
 # Build-time platform architecture
 ARG TARGETARCH
 
+# Upgrade
+RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget adduser && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 # Create appuser
 RUN adduser --no-create-home --disabled-password appuser
 
 # Precreate workdir
 RUN mkdir -p /app/bin
 
-# Upgrade
-RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && apt-get clean && rm -rf /var/lib/apt/lists/*
-
 # Install cardano-cli
 ARG CARDANO_NODE_VERSION=10.5.1
 ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/$CARDANO_NODE_VERSION/cardano-node-$CARDANO_NODE_VERSION-linux.tar.gz

mithril-signer/Makefile

@@ -11,6 +11,25 @@ build:
 run: build
 	./mithril-signer
 
+build-ci:
+	# Check that we are on Linux, then build
+	if [ "$$(uname -s)" != "Linux" ]; then \
+		echo "Error: this target only supports Linux"; \
+		exit 1; \
+	fi; \
+	RAW_ARCH=$$(uname -m); \
+	if [ "$$RAW_ARCH" = "x86_64" ]; then \
+		ARCH="amd64"; \
+	elif [ "$$RAW_ARCH" = "aarch64" ]; then \
+		ARCH="arm64"; \
+	else \
+		echo "Error: unsupported architecture $$RAW_ARCH"; \
+		exit 1; \
+	fi; \
+	${CARGO} build --release; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-signer ./bin-linux-$${ARCH}/mithril-signer
+
 debug:
 	${CARGO} run -- -vvv
 
@@ -31,7 +50,7 @@ doc:
 docker-build:
 	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile .
 
-docker-build-ci: build
+docker-build-ci: build-ci
 	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION .
 
 docker-run: