Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Build Docker image
run: |
docker build --build-arg git_commit=${{ env.GIT_COMMIT_LONG }} --build-arg build_flag="--release" --build-arg build_folder="release" \
docker build --build-arg git_commit=${{ env.GIT_COMMIT_LONG }} \
-f docker/Dockerfile . \
-t ${{ env.DOCKER_IMAGE }}:${{ env.BRANCH_NAME }} \
-t ${{ env.DOCKER_IMAGE }}:${{ env.GIT_COMMIT_SHORT }} \
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ARG build_date
ARG target=x86_64-unknown-linux-gnu
ARG binaries=
ARG copy=${binaries:+_copy}
ARG build_flag=
ARG build_folder=
ARG build_flag=--release
ARG build_folder=release

FROM rust:1.74-slim-bookworm AS builder
ARG git_commit
Expand Down
4 changes: 2 additions & 2 deletions docker/compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ cd "$ROOT_DIR"
GIT_COMMIT=$(git rev-parse --short HEAD)

if [[ "$OSTYPE" == "linux-gnu"* ]]; then
docker build --build-arg git_commit="$GIT_COMMIT" --build-arg build_flag="--release" --build-arg build_folder="release" -f docker/Dockerfile . -t linera || exit 1
docker build --build-arg git_commit="$GIT_COMMIT" -f docker/Dockerfile . -t linera || exit 1
elif [[ "$OSTYPE" == "darwin"* ]]; then
CPU_ARCH=$(sysctl -n machdep.cpu.brand_string)
if [[ "$CPU_ARCH" == *"Apple"* ]]; then
docker build --build-arg git_commit="$GIT_COMMIT" --build-arg target=aarch64-unknown-linux-gnu --build-arg build_flag="--release" --build-arg build_folder="release" -f docker/Dockerfile -t linera . || exit 1
docker build --build-arg git_commit="$GIT_COMMIT" --build-arg target=aarch64-unknown-linux-gnu -f docker/Dockerfile -t linera . || exit 1
else
echo "Unsupported Architecture: $CPU_ARCH"
exit 1
Expand Down
7 changes: 3 additions & 4 deletions linera-service/src/cli_wrappers/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,11 @@ impl DockerImage {
.args(["--build-arg", &build_arg]);

match build_mode {
BuildMode::Release => {
command.args(["--build-arg", "build_flag=--release"]);
command.args(["--build-arg", "build_folder=release"]);
}
// Release is the default, so no need to add any arguments
BuildMode::Release => {}
BuildMode::Debug => {
command.args(["--build-arg", "build_folder=debug"]);
command.args(["--build-arg", "build_flag="]);
}
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-validator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GENESIS_CONFIG="docker/genesis.json"

if [ -z "$REMOTE_IMAGE" ]; then
echo "Building local image from commit $GIT_COMMIT..."
docker build --build-arg git_commit="$GIT_COMMIT" --build-arg build_flag="--release" --build-arg build_folder="release" -f docker/Dockerfile . -t linera
docker build --build-arg git_commit="$GIT_COMMIT" -f docker/Dockerfile . -t linera
export LINERA_IMAGE=linera
else
export LINERA_IMAGE="us-docker.pkg.dev/linera-io-dev/linera-public-registry/linera:${BRANCH_NAME}_release"
Expand Down
Loading