fix: support new Cardano binary archive folder structure in Docker images

The binaries are produced in 'bin' folder from '8.9.0' when they used to be at root of archive.

Author: jpraynaud

mithril-aggregator/Dockerfile

@@ -47,16 +47,16 @@ COPY --from=rustbuilder /app/target/release/mithril-aggregator /app/bin/mithril-
 # Copy the config files
 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 $CARDANO_BIN_URL
-RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
+RUN (tar xzf cardano-bin.tar.gz ./bin/cardano-cli && mv /bin/cardano-cli /app/bin) || (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
 
+#Workdir
+WORKDIR /app/
+RUN chown -R appuser /app/
+
 # Use an unprivileged user
 USER appuser
 

mithril-aggregator/Dockerfile.ci

@@ -17,7 +17,7 @@ RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && a
 ARG CARDANO_NODE_VERSION=8.7.3
 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
 RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
-    && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
+    && (tar xzf cardano-bin.tar.gz ./bin/cardano-cli && mv /bin/cardano-cli /app/bin) || (tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin) \ 
     && /app/bin/cardano-cli --version \
     && rm -f cardano-bin.tar.gz
 

mithril-signer/Dockerfile

@@ -48,16 +48,16 @@ COPY --from=rustbuilder /app/target/release/mithril-signer /app/bin/mithril-sign
 # Copy the config files
 COPY --from=rustbuilder /app/mithril-signer/config /app/config
 
-#Workdir
-WORKDIR /app/
-RUN chown -R appuser /app/
-
 # Install cardano-cli
 RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL
-RUN tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin
+RUN (tar xzf cardano-bin.tar.gz ./bin/cardano-cli && mv /bin/cardano-cli /app/bin) || (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
 
+#Workdir
+WORKDIR /app/
+RUN chown -R appuser /app/
+
 # Use an unprivileged user
 USER appuser
 

mithril-signer/Dockerfile.ci

@@ -17,7 +17,7 @@ RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && a
 ARG CARDANO_NODE_VERSION=8.7.3
 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
 RUN wget -nv -O cardano-bin.tar.gz $CARDANO_BIN_URL \
-    && tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin \
+    && (tar xzf cardano-bin.tar.gz ./bin/cardano-cli && mv /bin/cardano-cli /app/bin) || (tar xzf cardano-bin.tar.gz ./cardano-cli && mv cardano-cli /app/bin) \ 
     && /app/bin/cardano-cli --version \
     && rm -f cardano-bin.tar.gz