Fix dev Docker images

Author: jpraynaud

.dockerignore

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

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,7 +49,7 @@ 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/

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-signer/Dockerfile

@@ -18,22 +18,22 @@ 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-signer/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-signer /app/mithril-signer.1 && mkdir -p /app/mithril-signer/src
+COPY mithril-signer/Cargo.toml /app/mithril-signer/
+RUN echo "fn  main () {}" > /app/mithril-signer/src/main.rs
+RUN cargo build --release -p mithril-signer --manifest-path /app/mithril-signer/Cargo.toml
+
+# Rollback the rest of the files into the container
+RUN rm -rf /app/mithril-signer && mv /app/mithril-signer.1 /app/mithril-signer
+COPY ./mithril-signer/src/main.rs /app/mithril-signer/src/
 
-# Copy the rest of the files into the container
-COPY ./mithril-signer /app/
 
 # Build the binary
-RUN cargo build --release
+RUN cargo build --release -p mithril-signer
+RUN /app/target/release/mithril-signer --version
 
 ###############################
 # STEP 2: build a small image
@@ -50,10 +50,11 @@ COPY --from=rustbuilder /etc/passwd /etc/passwd
 COPY --from=rustbuilder /app/target/release/mithril-signer /app/bin/mithril-signer
 
 # Copy the config files
-COPY --from=rustbuilder /app/config /app/config
+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 https://update-cardano-mainnet.iohk.io/cardano-node-releases/cardano-node-1.35.5-linux.tar.gz
@@ -65,4 +66,4 @@ RUN rm -f cardano-bin.tar.gz
 USER appuser
 
 # Run the executable
-ENTRYPOINT ["/app/bin/mithril-signer"]
+ENTRYPOINT ["/app/bin/mithril-signer", "-vvv"]