Merge pull request #710 from serokell/krendelhoff/chore-use-octez-executables

[Chore] Utilize OCTEZ_EXECUTABLES env var

Author: krendelhoff2

docker/README.md

@@ -19,7 +19,7 @@ Static binaries building using custom alpine image.
 image defined in [Dockerfile](build/Dockerfile). In order to build them you should specify
 `OCTEZ_VERSION` env variable and run the script:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 ./docker-static-build.sh
 ```
 After that, directory will contain built static binaries.
@@ -29,6 +29,14 @@ Currently supported architectures are: `host` and `aarch64`, so that
 one can build native binaries for current architecture or build `aarch64` binaries on
 `x86_64` machine.
 
+In order to build only specific binaries, or experimental/dev ones, you should specify
+`OCTEZ_EXECUTABLES` env variable:
+```
+export OCTEZ_VERSION="v17.3"
+export OCTEZ_EXECUTABLES="octez-smart-rollup-wasm-debugger octez-protocol-compiler octez-dal-node"
+./docker-static-build.sh
+```
+
 ### Compiling for `aarch64` on `x86_64` prerequisites
 
 Docker image defined in [`Dockerfile.aarch64`](build/Dockerfile.aarch64) uses qemu for
@@ -84,7 +92,7 @@ To see all available options, run:
 In order to build binary `.deb` packages specify `OCTEZ_VERSION` and
 run the following command:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os ubuntu --type binary
 ```
 
@@ -93,14 +101,14 @@ It is also possible to specify packages to build with `-p` or `--packages` optio
 ```
 # cd .. && ./docker/package.py -os ubuntu --type binary --packages <tezos-binary-1> <tezos-binary-2>
 # Example for baker
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os ubuntu --type binary -p tezos-client tezos-node
 ```
 
 In order to choose specific ubuntu distribution to build for (see [support policy](../docs/support-policy.md)),
 use `-d` or `--distributions` option:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os ubuntu --type binary -d focal jammy -p tezos-client tezos-node
 ```
 
@@ -118,7 +126,7 @@ sudo apt install <path to deb file>
 
 In order to build source packages run the following commands:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os ubuntu --type source
 # you can also build single source package
 cd .. && ./docker/package.py --os ubuntu --type source --packages tezos-client
@@ -137,7 +145,7 @@ the submitter info and signed.
 
 If you want to sign resulted source packages automatically, you can provide signer identity through `--gpg-sign` or `-s` option:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os ubuntu --type source -d focal jammy -p tezos-client -s <signer_info>
 ```
 For example, `signer_info` can be the following: `Roman Melnikov <[email protected]>`
@@ -211,22 +219,22 @@ To see all available options, run:
 In order to build binary `.rpm` packages specify `OCTEZ_VERSION` and
 run the following command:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os fedora --type binary
 ```
 
 It is also possible to specify packages to build with `-p` or `--packages` option. In order to do that run the following:
 ```
 # cd .. && ./docker/package.py --os fedora --type binary --packages <tezos-binary-1> <tezos-binary-2>
 # Example for baker
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os fedora --type binary -p tezos-client tezos-node
 ```
 
 In order to build packages for specific Fedora distribution (see [support policy](../docs/support-policy.md)),
 use `-d` or `--distributions` option:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os fedora -d 38 --type binary -p tezos-baking
 ```
 
@@ -247,15 +255,15 @@ sudo dnf install <path to rpm file>
 
 In order to build source packages run the following commands:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os fedora --type source
 # you can also build single source package
 cd .. && ./docker/package.py --os fedora --type source -p tezos-client
 ```
 
 If you want to sign resulted source packages automatically, you can provide signer identity through `--gpg-sign` or `-s` option:
 ```
-export OCTEZ_VERSION="v14.1"
+export OCTEZ_VERSION="v17.3"
 cd .. && ./docker/package.py --os fedora --type source -p tezos-client -s <signer_info>
 ```
 For example, `signer_info` can be the following: `Roman Melnikov <[email protected]>`

docker/build/Dockerfile

@@ -19,5 +19,6 @@ ENV OPAMYES true
 COPY ./build/build-deps.sh /build-deps.sh
 RUN /build-deps.sh
 COPY ./build/build-tezos.sh /build-tezos.sh
+ARG OCTEZ_EXECUTABLES
 RUN /build-tezos.sh
 RUN upx octez-*

docker/build/Dockerfile.aarch64

@@ -26,5 +26,6 @@ ENV OPAMYES true
 COPY ./build/build-deps.sh /build-deps.sh
 RUN /build-deps.sh
 COPY ./build/build-tezos.sh /build-tezos.sh
+ARG OCTEZ_EXECUTABLES
 RUN /build-tezos.sh
 RUN upx octez-*

docker/docker-static-build.sh

@@ -8,11 +8,18 @@
 
 set -euo pipefail
 
-binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec")
+if [ -z ${OCTEZ_EXECUTABLES+x} ]; then
 
-for proto in $(jq -r ".active | .[]" ../protocols.json); do
-    binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto" "octez-smart-rollup-node-$proto")
-done
+    binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec")
+
+    for proto in $(jq -r ".active | .[]" ../protocols.json); do
+        binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto" "octez-smart-rollup-node-$proto")
+    done
+
+    OCTEZ_EXECUTABLES="$( IFS=$' '; echo "${binaries[*]}" )"
+else
+    IFS=' ' read -r -a binaries <<< "$OCTEZ_EXECUTABLES"
+fi
 
 if [[ "${USE_PODMAN-}" == "True" ]]; then
     virtualisation_engine="podman"
@@ -40,7 +47,7 @@ if [[ $arch == "aarch64" && $(uname -m) != "x86_64" ]]; then
     echo "Compiling for aarch64 is supported only from aarch64 and x86_64"
 fi
 
-"$virtualisation_engine" build -t alpine-tezos -f "$docker_file" --build-arg OCTEZ_VERSION="$OCTEZ_VERSION" .
+"$virtualisation_engine" build -t alpine-tezos -f "$docker_file" --build-arg=OCTEZ_VERSION="$OCTEZ_VERSION" --build-arg=OCTEZ_EXECUTABLES="$OCTEZ_EXECUTABLES" .
 container_id="$("$virtualisation_engine" create alpine-tezos)"
 for b in "${binaries[@]}"; do
     "$virtualisation_engine" cp "$container_id:/tezos/$b" "$b"