added configurable build profiles to dockerfiles (#721)

* added configurable build profiles to dockerfiles

* update changelog

* updated defaults

* moved to changed

* Revert "updated defaults"

This reverts commit dece6e3.

* updated defaults

* fixed build profile dir not acesseible from stage 2

* added bob_storage to dockerignore

* change rust ver and remove unnecessary lines

* combined consecutive run commands

* fixes

* swapped musl for gnu in build

* build docker images with itegration-test profile

* added build target arg

* fix

* added build profile to docker image build section

Co-authored-by: Max <[email protected]>

Author: Ziktorin

.dockerignore

@@ -14,4 +14,5 @@ Cargo.lock
 /cluster_test
 /dockerfiles/*
 !/dockerfiles/default-configs
-/compose_examples
+/compose_examples
+bob-grpc/src/bob_storage.rs

.github/workflows/integration-tests.yml

@@ -98,6 +98,8 @@ jobs:
     strategy:
       matrix:
         key: [8, 16]
+    env:
+      BUILD_PROFILE: "integration-test"
     steps:
       - name: Checks-out repository 
         uses: actions/checkout@v3
@@ -124,6 +126,7 @@ jobs:
           build-args: |
             COMMIT_HASH=${{ env.BOB_COMMIT_HASH }}
             KEY_SIZE=${{ matrix.key}}
+            BUILD_PROFILE=${{ env.BUILD_PROFILE }}
       - name: Save image
         run: |
           docker save -o /tmp/bob-image-key${{ matrix.key }}.tar qoollo/bob:${{ env.VERSION }}-key${{ matrix.key }}

CHANGELOG.md

@@ -20,6 +20,7 @@ Bob versions changelog
 - Remove 'termion' crate from dependencies (#718)
 - Make delete operation recoverable (#533)
 - Binaries sizes reduced for 'integration-test' profile (#727)
+- Configurable build profiles in Dockerfiles (#717)
 
 #### Fixed
 - PID unsafe type conversion fixed (#719)

dockerfiles/alpine/Dockerfile

@@ -1,23 +1,24 @@
 # build image
-FROM rust:1.47.0 as cargo-build
+FROM rust:1.66.0 as cargo-build
 
 # rust toolchain version
 ARG RUST_TC_VER=stable
 ARG KEY_SIZE=8
 ARG COMMIT_HASH
+ARG BUILD_PROFILE=release
+ARG BUILD_TARGET=x86_64-unknown-linux-musl
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends musl-tools \
   && rustup install $RUST_TC_VER \
   && rustup default $RUST_TC_VER \
-  && rustup target add x86_64-unknown-linux-musl
+  && rustup target add $BUILD_TARGET
 
 WORKDIR /usr/src/bob
 
 # crates downloading and initial build
 RUN mkdir -p bob/src bob-backend/src bob-common/src bob-grpc/src bob-apps/bin bob-access/src
 RUN mkdir target
-ENV OUT_DIR /usr/src/bob/target
 COPY Cargo.toml Cargo.toml
 COPY bob/Cargo.toml bob/Cargo.toml
 COPY bob-backend/Cargo.toml bob-backend/Cargo.toml
@@ -27,6 +28,14 @@ COPY bob-apps/Cargo.toml bob-apps/Cargo.toml
 COPY bob-access/Cargo.toml bob-access/Cargo.toml
 RUN sed -i "s|\[\[bench\]\]|\[\[bench_ignore\]\]|g" */Cargo.toml
 
+# estimate build directory
+RUN echo "$(case "$BUILD_PROFILE" in\
+  ("dev") echo "debug";;\
+  ("test") echo "debug";;\
+  ("bench") echo "release";;\
+  (*) echo "$BUILD_PROFILE";;\
+  esac)" >> ./build_profile_dir
+
 RUN echo "fn main() {println!(\"if you see this, the build broke\")}" > bob/src/lib.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-backend/src/lib.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-common/src/lib.rs \
@@ -39,26 +48,28 @@ RUN echo "fn main() {println!(\"if you see this, the build broke\")}" > bob/src/
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-apps/bin/brt.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-apps/bin/bobt.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-access/src/lib.rs \
-  && cargo build --release --target=x86_64-unknown-linux-musl
+  && cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET
 
 
 # separate stage for proto build
 RUN echo "fn main() {println!(\"if you see this, the build broke\")} pub mod grpc {include!(\"bob_storage.rs\");}" > bob-grpc/src/lib.rs \
   && mkdir -p bob-grpc/proto
 COPY bob-grpc/proto/* bob-grpc/proto/
 COPY bob-grpc/build.rs bob-grpc/build.rs
-RUN cargo build --release --target=x86_64-unknown-linux-musl \
-  && rm -f target/x86_64-unknown-linux-musl/release/deps/bob* \
-  && rm -f target/x86_64-unknown-linux-musl/release/deps/libbob* 
+RUN cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET \
+  && rm -f target/$BUILD_TARGET/$(cat ./build_profile_dir)/deps/bob* \
+  && rm -f target/$BUILD_TARGET/$(cat ./build_profile_dir)/deps/libbob*
 
 # final build
 COPY . .
 ENV BOB_KEY_SIZE=${KEY_SIZE}
 ENV BOB_COMMIT_HASH=${COMMIT_HASH}
-RUN cargo build --release --target=x86_64-unknown-linux-musl
+RUN cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET \
+  && mkdir target/build_output \ 
+  && mv target/$BUILD_TARGET/$(cat ./build_profile_dir)/bobd target/build_output/bobd
 
 # bobd image
-FROM alpine:3.12.0
+FROM alpine:3.16
 
 # SSH
 ENV NOTVISIBLE "in users profile"
@@ -75,9 +86,8 @@ RUN apk update \
   && adduser --shell /bin/bash -G bobd -G wheel -S bobd
 
 WORKDIR /home/bob/bin/
-COPY --from=cargo-build /usr/src/bob/target/x86_64-unknown-linux-musl/release/bobd .
-RUN chown bobd:bobd bobd \
-  && mkdir /bob/log -p && chown bobd:bobd /bob/log -R \
+COPY --chown=bobd:bobd --from=cargo-build /usr/src/bob/target/build_output/bobd .
+RUN mkdir /bob/log -p && chown bobd:bobd /bob/log -R \
   && mkdir /bob/data/d1 -p && chown bobd:bobd /bob/data/d1 -R \
   && mkdir /bob/configs -p && chown bobd:bobd /bob/configs -R \
   && mkdir ~/.ssh \
@@ -103,9 +113,7 @@ RUN chown bobd:bobd bobd \
 
 COPY dockerfiles/default-configs/ /bob/configs
 
-EXPOSE 80
-EXPOSE 22
-EXPOSE 20000
+EXPOSE 22 80 20000
 USER bobd
 ENTRYPOINT ["/bin/bash", "./run.sh"]
 CMD ["cluster.yaml", "node.yaml"]

dockerfiles/ubuntu/Dockerfile

@@ -1,21 +1,22 @@
 # build image
-FROM rust:1.47.0 as cargo-build
+FROM rust:1.66.0 as cargo-build
 
 # rust toolchain version
 ARG RUST_TC_VER=stable
 ARG KEY_SIZE=8
 ARG COMMIT_HASH
+ARG BUILD_PROFILE=release
+ARG BUILD_TARGET=x86_64-unknown-linux-gnu
 
 RUN rustup install $RUST_TC_VER \
   && rustup default $RUST_TC_VER \
-  && rustup target add x86_64-unknown-linux-gnu
+  && rustup target add $BUILD_TARGET
 
 WORKDIR /usr/src/bob
 
 # crates downloading and initial build
 RUN mkdir -p bob/src bob-backend/src bob-common/src bob-grpc/src bob-apps/bin bob-access/src
 RUN mkdir target
-ENV OUT_DIR /usr/src/bob/target
 COPY Cargo.toml Cargo.toml
 COPY bob/Cargo.toml bob/Cargo.toml
 COPY bob-backend/Cargo.toml bob-backend/Cargo.toml
@@ -25,6 +26,14 @@ COPY bob-apps/Cargo.toml bob-apps/Cargo.toml
 COPY bob-access/Cargo.toml bob-access/Cargo.toml
 RUN sed -i "s|\[\[bench\]\]|\[\[bench_ignore\]\]|g" */Cargo.toml
 
+# estimate build directory
+RUN echo "$(case "$BUILD_PROFILE" in\
+  ("dev") echo "debug";;\
+  ("test") echo "debug";;\
+  ("bench") echo "release";;\
+  (*) echo "$BUILD_PROFILE";;\
+  esac)" >> ./build_profile_dir
+
 RUN echo "fn main() {println!(\"if you see this, the build broke\")}" > bob/src/lib.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-backend/src/lib.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-common/src/lib.rs \
@@ -37,23 +46,25 @@ RUN echo "fn main() {println!(\"if you see this, the build broke\")}" > bob/src/
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-apps/bin/brt.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-apps/bin/bobt.rs \
   && echo "fn main() {println!(\"if you see this, the build broke\")}" > bob-access/src/lib.rs \
-  && cargo build --release --target=x86_64-unknown-linux-gnu
+  && cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET
 
 
 # separate stage for proto build
 RUN echo "fn main() {println!(\"if you see this, the build broke\")} pub mod grpc {include!(\"bob_storage.rs\");}" > bob-grpc/src/lib.rs \
   && mkdir -p bob-grpc/proto
 COPY bob-grpc/proto/* bob-grpc/proto/
 COPY bob-grpc/build.rs bob-grpc/build.rs
-RUN cargo build --release --target=x86_64-unknown-linux-gnu \
-  && rm -f target/x86_64-unknown-linux-gnu/release/deps/bob* \
-  && rm -f target/x86_64-unknown-linux-gnu/release/deps/libbob*
+RUN cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET \
+  && rm -f target/$BUILD_TARGET/$(cat ./build_profile_dir)/deps/bob* \
+  && rm -f target/$BUILD_TARGET/$(cat ./build_profile_dir)/deps/libbob*
 
 # final build
 COPY . .
 ENV BOB_KEY_SIZE=${KEY_SIZE}
 ENV BOB_COMMIT_HASH=${COMMIT_HASH}
-RUN cargo build --release --target=x86_64-unknown-linux-gnu
+RUN cargo build --profile=${BUILD_PROFILE} --target=$BUILD_TARGET \
+  && mkdir target/build_output \ 
+  && mv target/$BUILD_TARGET/$(cat ./build_profile_dir)/bobd target/build_output/bobd
 
 # bobd image
 FROM ubuntu:20.04
@@ -76,9 +87,8 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/bob/bin/
-COPY --from=cargo-build /usr/src/bob/target/x86_64-unknown-linux-gnu/release/bobd .
-RUN chown bobd:bobd bobd \
-  && mkdir /bob/log -p && chown bobd:bobd /bob/log -R \
+COPY --chown=bobd:bobd --from=cargo-build /usr/src/bob/target/build_output/bobd .
+RUN mkdir /bob/log -p && chown bobd:bobd /bob/log -R \
   && mkdir /bob/data/d1 -p && chown bobd:bobd /bob/data/d1 -R \
   && mkdir /bob/configs -p && chown bobd:bobd /bob/configs -R \
   && mkdir ~/.ssh \
@@ -104,9 +114,7 @@ RUN chown bobd:bobd bobd \
 
 COPY dockerfiles/default-configs/ /bob/configs
 
-EXPOSE 80
-EXPOSE 22
-EXPOSE 20000
+EXPOSE 22 80 20000
 USER bobd
 ENTRYPOINT ["./run.sh"]
 CMD ["cluster.yaml", "node.yaml"]