Merge pull request #5 from dimacurrentai/generic_run

Generic run

Author: dkorolev

.gitignore

@@ -1,2 +1,5 @@
 Cargo.lock
 target/
+
+# Using the `Dockerfile.template` in the root directory now.
+Dockerfile

step00_hw/Dockerfile Dockerfile.templatestep00_hw/Dockerfile renamed to Dockerfile.template

@@ -5,18 +5,18 @@ FROM alpine AS build
 RUN apk add rustup clang musl
 
 # Init local rust via `rustup`, including static targets builder.
-RUN rustup-init -y -t x86_64-unknown-linux-musl --no-modify-path 
+RUN rustup-init -y -t "$(uname -m)-unknown-linux-musl" --no-modify-path 
 RUN mv /root/.cargo/bin/* /usr/local/bin/
 
 # Build the project.
 COPY ./code /code
 WORKDIR /code
-RUN cargo build --release --target x86_64-unknown-linux-musl
+RUN cargo build --release --target "$(uname -m)-unknown-linux-musl"
 
 # Prepare the static binary.
-RUN cp ./target/x86_64-unknown-linux-musl/release/hw /
+RUN cp ./target/"$(uname -m)-unknown-linux-musl"/release/"$(cat Cargo.toml | grep '^name\s*=' | cut -f2 -d'"')" /binary
 
 # The resulting container with the static binary only.
 FROM scratch
-COPY --from=build /hw /hw
-ENTRYPOINT ["/hw"]
+COPY --from=build /binary /binary
+ENTRYPOINT ["/binary"]

step00_hw/run.sh

@@ -2,5 +2,5 @@
 
 set -e
 
-docker build . -t demo
+docker build -f ../Dockerfile.template . -t demo
 docker run --rm -t demo

step01_cmdline/Dockerfile

@@ -2,6 +2,6 @@
 
 set -e
 
-docker build . -t demo
+docker build -f ../Dockerfile.template . -t demo
 docker run --rm -t demo --a 1 --b 2
 docker run --rm -t demo --a 3 --b 4

step01_cmdline/run.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-docker build . -t demo
+docker build -f ../Dockerfile.template . -t demo
 
 docker run --rm --network=bridge -p 3000:3000 -t demo &
 PID=$!

step02_httpserver/Dockerfile

@@ -2,7 +2,7 @@
 
 set -e
 
-docker build . -t demo
+docker build -f ../Dockerfile.template . -t demo
 
 echo '```mermaid' >.mermaid.md
 docker run --rm -t demo | tee >>.mermaid.md