fix(devnet): Docker images

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.8.20"
+version = "0.8.21"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

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

@@ -32,6 +32,22 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-aggregator -f mithril-aggregator/Dockerfile .
 
 docker-build-ci: build
+	# 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; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-aggregator ./bin-linux-$${ARCH}/mithril-aggregator
 	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-aggregator/src/services/certifier/interface.rs

@@ -38,7 +38,7 @@ pub enum CertifierServiceError {
 
     /// No certificate for this epoch
     #[error(
-        "There is an epoch gap between the last certificate epoch ({certificate_epoch:?}) and current epoch ({current_epoch:?})"
+        "There is an epoch gap between the last certificate epoch ({certificate_epoch:?}) and current epoch ({current_epoch:?}). A leader aggregator must be re-genesis by the owner of the genesis keys, a follower aggregator will automatically catchup with the leader's certificate chain."
     )]
     CertificateEpochGap {
         /// Epoch of the last issued certificate

mithril-client-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.12.38"
+version = "0.12.39"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }

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

@@ -40,6 +40,22 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile .
 
 docker-build-ci: build
+	# 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; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-client ./bin-linux-$${ARCH}/mithril-client
 	cd ../ && docker build -t mithril/mithril-client -f mithril-client-cli/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM .
 
 docker-run:

mithril-relay/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-relay"
-version = "0.2.1"
+version = "0.2.2"
 description = "A Mithril relay"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-relay/Makefile

@@ -26,6 +26,22 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-relay -f mithril-relay/Dockerfile .
 
 docker-build-ci: build
+	# 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; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-relay ./bin-linux-$${ARCH}/mithril-relay
 	cd ../ && docker build -t mithril/mithril-relay -f mithril-relay/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM .
 
 docker-run:

mithril-signer/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.3.13"
+version = "0.3.14"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }

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

@@ -32,6 +32,22 @@ docker-build:
 	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile .
 
 docker-build-ci: build
+	# 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; \
+	mkdir -p ./bin-linux-$${ARCH}; \
+	cp ../target/release/mithril-signer ./bin-linux-$${ARCH}/mithril-signer
 	cd ../ && docker build -t mithril/mithril-signer -f mithril-signer/Dockerfile.ci --build-arg DOCKER_IMAGE_FROM --build-arg CARDANO_NODE_VERSION .
 
 docker-run:

mithril-test-lab/mithril-devnet/VERSION

@@ -1,2 +1,2 @@
-0.4.22
+0.4.23
 

mithril-test-lab/mithril-devnet/devnet-run.sh

@@ -31,23 +31,23 @@ echo
 # Change directory
 pushd ${ARTIFACTS_DIR} > /dev/null
 
-# Start devnet DMQ nodes
-if [[ "${NODES}" = *"dmq"* ]] || [[ "${NODES}" = "*" ]]; then
+# Start devnet Cardano nodes
+if [[ "${NODES}" = *"cardano"* ]] || [[ "${NODES}" = "*" ]]; then
     echo "====================================================================="
-    echo " Start DMQ nodes"
+    echo " Start Cardano nodes"
     echo "====================================================================="
     echo
-    ./start-dmq.sh
+    ./start-cardano.sh
     echo
 fi
 
-# Start devnet Cardano nodes
-if [[ "${NODES}" = *"cardano"* ]] || [[ "${NODES}" = "*" ]]; then
+# Start devnet DMQ nodes
+if [[ "${NODES}" = *"dmq"* ]] || [[ "${NODES}" = "*" ]]; then
     echo "====================================================================="
-    echo " Start Cardano nodes"
+    echo " Start DMQ nodes"
     echo "====================================================================="
     echo
-    ./start-cardano.sh
+    ./start-dmq.sh
     echo
 fi
 

mithril-test-lab/mithril-devnet/mkfiles/mkfiles-docker.sh

@@ -128,6 +128,7 @@ cat >> docker-compose.yaml <<EOF
       - SNAPSHOT_UPLOADER_TYPE=local
       - SNAPSHOT_COMPRESSION_ALGORITHM=zstandard
       - DATA_STORES_DIRECTORY=/data/mithril/aggregator/stores
+      - DMQ_NODE_SOCKET_PATH=/data/ipc/dmq.node.sock
       - CARDANO_NODE_SOCKET_PATH=/data/ipc/node.sock
       - CARDANO_NODE_VERSION=${CARDANO_NODE_VERSION}
       - CARDANO_CLI_PATH=/app/bin/cardano-cli
@@ -215,6 +216,7 @@ EOF
       - RUN_INTERVAL=700
       - DB_DIRECTORY=/data/db
       - DATA_STORES_DIRECTORY=/data/mithril/signer-${NODE}/stores
+      - DMQ_NODE_SOCKET_PATH=/data/ipc/dmq.node.sock
       - CARDANO_NODE_SOCKET_PATH=/data/ipc/node.sock
       - CARDANO_CLI_PATH=/app/bin/cardano-cli
       - KES_SECRET_KEY_PATH=/data/shelley/kes.skey
@@ -255,6 +257,7 @@ cat >> docker-compose.yaml <<EOF
       - RUN_INTERVAL=700
       - DB_DIRECTORY=/data/db
       - DATA_STORES_DIRECTORY=/data/mithril/signer-${NODE}/stores
+      - DMQ_NODE_SOCKET_PATH=/data/ipc/dmq.node.sock
       - CARDANO_NODE_SOCKET_PATH=/data/ipc/node.sock
       - CARDANO_CLI_PATH=/app/bin/cardano-cli
     command: