Merge pull request #726 from input-output-hk/jpraynaud/725-update-cardano-node-1.35.5

Update Cardano node to `1.35.5`

Author: jpraynaud

.dockerignore

@@ -1,4 +1,7 @@
 .git
-/mithril-test-lab
+.sock
+.socket
 /target
-/**/data
+/**/artifacts
+/**/data
+/**/node_modules

docs/root/manual/getting-started/run-signer-node.md

@@ -43,7 +43,7 @@ For more information about the **Mithril Protocol**, please refer to the [About
   * Read rights on the `Database` folder (`--database-path` setting of the **Cardano Node**)
   * Read/Write rights on the `Inter Process Communication` file (usually `CARDANO_NODE_SOCKET_PATH` env var used to launch the **Cardano Node**)
 
-* Install a recent version of the [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.4) (version 1.35.4+)
+* Install a recent version of the [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.5) (version 1.35.5+)
 
 * Install a [correctly configured](https://www.rust-lang.org/learn/get-started) Rust toolchain (latest stable version).
 

docs/versioned_docs/version-maintained/manual/getting-started/run-signer-node.md

@@ -43,7 +43,7 @@ For more information about the **Mithril Protocol**, please refer to the [About
   * Read rights on the `Database` folder (`--database-path` setting of the **Cardano Node**)
   * Read/Write rights on the `Inter Process Communication` file (usually `CARDANO_NODE_SOCKET_PATH` env var used to launch the **Cardano Node**)
 
-* Install a recent version of the [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.4) (version 1.35.4+)
+* Install a recent version of the [`cardano-cli`](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.5) (version 1.35.5+)
 
 * Install a [correctly configured](https://www.rust-lang.org/learn/get-started) Rust toolchain (latest stable version).
 

mithril-aggregator/Dockerfile

@@ -18,22 +18,21 @@ RUN adduser --no-create-home --disabled-password appuser
 WORKDIR /app
 
 # Copy local dependencies
-COPY mithril-stm/ /mithril-stm/
-COPY Cargo.lock /mithril-stm/
-COPY mithril-common/ /mithril-common/
-COPY Cargo.lock /mithril-common/
+COPY . .
 
 # Build the app using a dummy main in order to cache dependencies
-COPY mithril-aggregator/Cargo.toml /app
-COPY Cargo.lock /app/
-RUN mkdir -p /app/src/ && echo "fn  main () {}" > /app/src/main.rs
-RUN cargo build --release --manifest-path /app/Cargo.toml
+RUN mv /app/mithril-aggregator /app/mithril-aggregator.1 && mkdir -p /app/mithril-aggregator/src
+COPY mithril-aggregator/Cargo.toml /app/mithril-aggregator/
+RUN echo "fn  main () {}" > /app/mithril-aggregator/src/main.rs
+RUN cargo build --release -p mithril-aggregator --manifest-path /app/mithril-aggregator/Cargo.toml
 
-# Copy the rest of the files into the container
-COPY ./mithril-aggregator /app/
+# Rollback the rest of the files into the container
+RUN rm -rf /app/mithril-aggregator && mv /app/mithril-aggregator.1 /app/mithril-aggregator
+COPY ./mithril-aggregator/src/main.rs /app/mithril-aggregator/src/
 
 # Build the binary
-RUN cargo build --release
+RUN cargo build --release -p mithril-aggregator
+RUN /app/target/release/mithril-aggregator --version
 
 ###############################
 # STEP 2: build a small image
@@ -50,14 +49,14 @@ COPY --from=rustbuilder /etc/passwd /etc/passwd
 COPY --from=rustbuilder /app/target/release/mithril-aggregator /app/bin/mithril-aggregator
 
 # Copy the config files
-COPY --from=rustbuilder /app/config /app/config
+COPY --from=rustbuilder /app/mithril-aggregator/config /app/config
 
 #Workdir
 WORKDIR /app/
 RUN chown -R appuser /app/
 
 # Install cardano-cli
-RUN wget -nv -O cardano-bin.tar.gz https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.4-linux.tar.gz
+RUN wget -nv -O cardano-bin.tar.gz https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.5-linux.tar.gz
 RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
 RUN /app/bin/cardano-cli --version
 RUN rm -f cardano-bin.tar.gz

mithril-aggregator/Dockerfile.ci

@@ -14,7 +14,7 @@ COPY mithril-aggregator/mithril-aggregator /app/bin/mithril-aggregator
 COPY mithril-aggregator/config /app/config
 
 # Install cardano-cli
-RUN wget -nv -O cardano-bin.tar.gz https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.4-linux.tar.gz
+RUN wget -nv -O cardano-bin.tar.gz https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.5-linux.tar.gz
 RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
 RUN /app/bin/cardano-cli --version
 RUN rm -f cardano-bin.tar.gz

mithril-client/Dockerfile

@@ -18,22 +18,21 @@ RUN adduser --no-create-home --disabled-password appuser
 WORKDIR /app
 
 # Copy local dependencies
-COPY mithril-stm/ /mithril-stm/
-COPY Cargo.lock /mithril-stm/
-COPY mithril-common/ /mithril-common/
-COPY Cargo.lock /mithril-common/
+COPY . .
 
 # Build the app using a dummy main in order to cache dependencies
-COPY mithril-client/Cargo.toml /app
-COPY Cargo.lock /app/
-RUN mkdir -p /app/src/ && echo "fn  main () {}" > /app/src/main.rs
-RUN cargo build --release --manifest-path /app/Cargo.toml
+RUN mv /app/mithril-client /app/mithril-client.1 && mkdir -p /app/mithril-client/src
+COPY mithril-client/Cargo.toml /app/mithril-client/
+RUN echo "fn  main () {}" > /app/mithril-client/src/main.rs
+RUN cargo build --release -p mithril-client --manifest-path /app/mithril-client/Cargo.toml
 
-# Copy the rest of the files into the container
-COPY ./mithril-client /app/
+# Rollback the rest of the files into the container
+RUN rm -rf /app/mithril-client && mv /app/mithril-client.1 /app/mithril-client
+COPY ./mithril-client/src/main.rs /app/mithril-client/src/
 
 # Build the binary
-RUN cargo build --release
+RUN cargo build --release -p mithril-client
+RUN /app/target/release/mithril-client --version
 
 ###############################
 # STEP 2: build a small image
@@ -50,13 +49,14 @@ COPY --from=rustbuilder /etc/passwd /etc/passwd
 COPY --from=rustbuilder /app/target/release/mithril-client /app/bin/mithril-client
 
 # Copy the config files
-COPY --from=rustbuilder /app/config /app/config
+COPY --from=rustbuilder /app/mithril-client/config /app/config
 
 #Workdir
 WORKDIR /app/
+RUN chown -R appuser /app/
 
 # Use an unprivileged user
 USER appuser
 
 # Run the executable
-ENTRYPOINT ["/app/bin/mithril-client"]
+ENTRYPOINT ["/app/bin/mithril-client", "-vvv"]

mithril-infra/assets/docker/Dockerfile.cardano

@@ -1,4 +1,4 @@
-FROM inputoutput/cardano-node:1.35.4
+FROM inputoutput/cardano-node:1.35.5
 
 # Fix env file rights
 # In order to be able to interact with the Cardano node trough its 'node.socket'

mithril-infra/assets/docker/docker-compose-aggregator.yaml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   cardano-node-aggregator:
-    image: cardano-node/1.35.4-modified
+    image: cardano-node/1.35.5-modified
     container_name: cardano-node-aggregator
     build:
       context: .

mithril-infra/assets/docker/docker-compose-signer-unverified.yaml

@@ -4,7 +4,7 @@ version: "3.9"
 
 services:
   cardano-node-signer:
-    image: cardano-node/1.35.4-modified
+    image: cardano-node/1.35.5-modified
     container_name: cardano-node-signer-${SIGNER_ID}
     build:
       context: .

mithril-infra/assets/docker/docker-compose-signer-verified.yaml

@@ -4,7 +4,7 @@ version: "3.9"
 
 services:
   cardano-node-signer-relay:
-    image: cardano-node/1.35.4-modified
+    image: cardano-node/1.35.5-modified
     container_name: cardano-node-relay-signer-${SIGNER_ID}
     build:
       context: .
@@ -43,7 +43,7 @@ services:
       ]
 
   cardano-node-signer-block-producer:
-    image: cardano-node/1.35.4-modified
+    image: cardano-node/1.35.5-modified
     container_name: cardano-node-block-producer-signer-${SIGNER_ID}
     build:
       context: .