Skip to content
Snippets Groups Projects
Commit ebbc0ff7 authored by Gilles Filippini's avatar Gilles Filippini
Browse files

ci: enable multiplatform builds with docker buildx 

* Build from the Dockerfile and copy the artifacts from the resulting
  image
* Use cross-compilation at build stage when building for a foreign architecture
* Use 'docker buildx build ...' in CI to enable multiplatform builds
  If buildx is not installed use:
    DOCKER_BUILDKIT=1 docker build ...
* Gilab runner must expose tag 'multiplatform' which means it has native
  amd64 arch + emulated arm64 support:
    https://github.com/tonistiigi/binfmt/tree/deploy/v7.0.0-28#installing-emulators
    $ docker run --privileged --rm tonistiigi/binfmt --install arm64
parent 46fdd26c
Branches
Tags
1 merge request!150Draft: ci: enable multiplatform builds with docker buildx
Show whitespace changes
Inline Side-by-side
.dockerignore
+ 1
− 0
View file @ ebbc0ff7
...@@ -6,3 +6,4 @@ docker/Dockerfile ...@@ -6,3 +6,4 @@ docker/Dockerfile
docker-compose.yml docker-compose.yml
arm-build/ arm-build/
**/target/ **/target/
build/
.gitlab-ci.yml
+ 108
− 160
View file @ ebbc0ff7
# Runner tags:
# - dind: Docker in Docker
# - multiplatform: support amd64 and arm64 architectures
# https://github.com/tonistiigi/binfmt/tree/deploy/v7.0.0-28#installing-emulators
# $ docker run --privileged --rm tonistiigi/binfmt --install arm64
stages: stages:
- schedule - schedule
- labels - labels
...@@ -58,95 +64,59 @@ fmt_and_clippy: ...@@ -58,95 +64,59 @@ fmt_and_clippy:
- cargo clippy -- -V - cargo clippy -- -V
- cargo clippy --all --tests -- -D warnings - cargo clippy --all --tests -- -D warnings
build_debug: .docker_build:
extends: .env image: docker:20.10
rules: script:
- if: $CI_COMMIT_TAG - mkdir -p build
when: never # A builder name and node name must be specified so that the command doesn't fail when the builder exists already
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "master"' - docker buildx create --name gitlab-runner-buildx --node gitlab-runner-buildx0 --use
changes: - docker buildx ls
- Cargo.lock - echo docker buildx build --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $DOCKER_BUILD_OPTIONS .
- when: never - docker buildx build --tag "$IMAGE_NAME:$IMAGE_TAG" -f docker/Dockerfile $DOCKER_BUILD_OPTIONS .
tags:
- dind
.docker_build_save:
extends: .docker_build
stage: build stage: build
script: script:
- cargo clean -p duniter - !reference [.docker_build, script]
- cargo build --locked - docker run -d --rm --name "$CONTAINER" --entrypoint "" --user "$(id -u)" "$IMAGE_NAME:$IMAGE_TAG" sleep infinity
- mkdir build - docker cp "$CONTAINER:/usr/local/bin/duniter" build/
- mv target/debug/duniter build/duniter - docker stop "$CONTAINER"
artifacts: artifacts:
paths: paths:
- build/ - build/
expire_in: 3 day expire_in: 3 day
cache:
- key:
files:
- Cargo.lock
paths:
- target/debug
policy: push
build_debug_with_cache: build_debug:
extends: .env extends: .docker_build_save
rules: rules:
- changes:
- Cargo.lock
when: never
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "master"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "master"'
- when: never - when: never
stage: build variables:
script: IMAGE_NAME: "duniter/duniter-v2s"
- cargo clean -p duniter IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
- cargo build --locked DOCKER_BUILD_OPTIONS: "--load --build-arg debug=1"
- mkdir build CONTAINER: "duniter-v2s_$IMAGE_TAG"
- mv target/debug/duniter build/duniter
artifacts:
paths:
- build/
expire_in: 3 day
cache:
- key:
files:
- Cargo.lock
paths:
- target/debug
policy: pull
build_release: build_release:
extends: .env extends: .docker_build_save
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "master"'
stage: build
script:
- cargo build --locked --release
- mkdir build
- mv target/release/duniter build/duniter
artifacts:
paths:
- build/
expire_in: 3 day
build_release_manual:
extends: .env
rules:
- if: $CI_COMMIT_TAG
when: never
- when: manual - when: manual
stage: build variables:
allow_failure: true IMAGE_NAME: "duniter/duniter-v2s"
script: IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
- cargo build --locked --release DOCKER_BUILD_OPTIONS: "--load --platform linux/amd64"
- mkdir build CONTAINER: "duniter-v2s_$IMAGE_TAG"
- mv target/release/duniter build/duniter
artifacts:
paths:
- build/
expire_in: 3 day
tests_debug: test_debug:
extends: .env stage: tests
extends: .docker_build
rules: rules:
- if: $CI_COMMIT_REF_NAME =~ /^wip*$/ - if: $CI_COMMIT_REF_NAME =~ /^wip*$/
when: manual when: manual
...@@ -154,128 +124,106 @@ tests_debug: ...@@ -154,128 +124,106 @@ tests_debug:
when: never when: never
- if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"' - if: '$CI_MERGE_REQUEST_ID || $CI_COMMIT_BRANCH == "master"'
- when: manual - when: manual
stage: tests
variables: variables:
DUNITER_BINARY_PATH: "../build/duniter" IMAGE_NAME: "duniter/duniter-v2s-test"
DUNITER_END2END_TESTS_SPAWN_NODE_TIMEOUT: "20" IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
script: DOCKER_BUILD_OPTIONS: "--target build --build-arg debug=1 --build-arg cucumber=1"
- cargo test --workspace --exclude duniter-end2end-tests --exclude duniter-live-tests
- cargo cucumber -i account_creation*
- cargo cucumber -i certification*
- cargo cucumber -i identity_creation*
- cargo cucumber -i monetary_mass*
- cargo cucumber -i oneshot_account*
- cargo cucumber -i transfer_all*
after_script:
- cd target/debug/deps/
- rm cucumber_tests-*.d
- mv cucumber_tests* ../../../build/duniter-cucumber
artifacts:
paths:
- build/
expire_in: 3 day
tests_release: test_release:
extends: .env stage: tests
extends: .docker_build
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never - when: never
stage: tests
variables: variables:
DUNITER_BINARY_PATH: "../build/duniter" IMAGE_NAME: "duniter/duniter-v2s-test"
DUNITER_END2END_TESTS_SPAWN_NODE_TIMEOUT: "20" IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
script: DOCKER_BUILD_OPTIONS: "--target build --build-arg cucumber=1"
- cargo test --workspace --exclude duniter-end2end-tests --exclude duniter-live-tests
- cargo cucumber -i account_creation*
- cargo cucumber -i certification*
- cargo cucumber -i identity_creation*
- cargo cucumber -i monetary_mass*
- cargo cucumber -i oneshot_account*
- cargo cucumber -i transfer_all*
after_script:
- cd target/debug/deps/
- rm cucumber_tests-*.d
- mv cucumber_tests* ../../../build/duniter-cucumber
artifacts:
paths:
- build/
expire_in: 3 day
dependencies:
- build_release
.docker-build-app-image: deploy_docker_debug_sha:
stage: deploy stage: deploy
image: docker:18.06 extends: .docker_build
tags:
- docker
services:
- docker:dind
before_script:
- docker info
script:
- docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true
- docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" -f $DOCKERFILE_PATH .
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "duniter/duniter-v2s:$IMAGE_TAG"
- docker push "duniter/duniter-v2s:$IMAGE_TAG"
deploy_docker_test_image:
extends: .docker-build-app-image
rules: rules:
- if: $CI_COMMIT_REF_NAME =~ /^wip*$/ - if: $CI_COMMIT_TAG
when: manual
- if: '$CI_COMMIT_TAG || $CI_COMMIT_BRANCH == "master"'
when: never when: never
- when: manual - if: $CI_COMMIT_BRANCH == "master"
allow_failure: true script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- !reference [.docker_build, script]
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile" IMAGE_NAME: "duniter/duniter-v2s"
IMAGE_TAG: "test-image-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
DOCKER_BUILD_OPTIONS: "--push --build-arg debug=1"
deploy_docker_debug_sha: deploy_docker_release_sha:
extends: .docker-build-app-image stage: deploy
extends: .docker_build
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
- if: $CI_COMMIT_BRANCH == "master" - when: manual
variables: script:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- docker tag "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:debug-latest" - !reference [.docker_build, script]
- docker push "duniter/duniter-v2s:debug-latest" variables:
IMAGE_NAME: "duniter/duniter-v2s"
IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
DOCKER_BUILD_OPTIONS: "--push --platform linux/amd64"
deploy_docker_release_sha: deploy_docker_release_sha_multiplatform:
extends: .docker-build-app-image stage: deploy
needs: ["deploy_docker_release_sha"]
extends: .docker_build
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
- when: manual - when: manual
allow_failure: true script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- !reference [.docker_build, script]
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile" IMAGE_NAME: "duniter/duniter-v2s"
IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
dependencies: DOCKER_BUILD_OPTIONS: "--push --platform linux/amd64,linux/arm64"
- build_release_manual tags:
- dind
- multiplatform
deploy_docker_release_tag: deploy_docker_release_tag:
extends: .docker-build-app-image stage: deploy
extends: .docker_build
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never - when: never
script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- !reference [.docker_build, script]
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile" IMAGE_NAME: "duniter/duniter-v2s"
IMAGE_TAG: "$CI_COMMIT_TAG" IMAGE_TAG: "$CI_COMMIT_TAG"
after_script: DOCKER_BUILD_OPTIONS: "--push --platform linux/amd64 --tag $IMAGE_NAME:latest"
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- docker tag "duniter/duniter-v2s:$IMAGE_TAG" "duniter/duniter-v2s:latest" deploy_docker_release_tag_multiplatform:
- docker push "duniter/duniter-v2s:latest" stage: deploy
dependencies: needs: ["deploy_docker_release_tag"]
- build_release extends: .docker_build
rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never
script:
- docker login -u "$REPO_DOCKER_USER" -p "$REPO_DOCKER_PASS"
- !reference [.docker_build, script]
variables:
IMAGE_NAME: "pinidh/duniter-v2s"
IMAGE_TAG: "$CI_COMMIT_TAG"
DOCKER_BUILD_OPTIONS: "--push --platform linux/amd64,linux/arm64 --tag $IMAGE_NAME:latest"
tags:
- dind
- multiplatform
readme_docker_release_tag: readme_docker_release_tag:
stage: deploy_readme stage: deploy_readme
needs: ["deploy_docker_release_tag"]
rules: rules:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never - when: never
......
docker/Dockerfile
+ 59
− 28
View file @ ebbc0ff7
# Build with `docker buildx build ...`
# If buildx is not installed use `DOCKER_BUILDKIT=1 docker build ...`
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Build Stage # Build Stage
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Building for Debian buster because we need the binary to be compatible # When building for a foreign arch, use cross-compilation
# with the image paritytech/ci-linux:production (currently based on # https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
# debian:buster-slim) used by the gitlab CI FROM --platform=$BUILDPLATFORM rust:1-bullseye as build
FROM rust:1-buster as build ARG BUILDPLATFORM
ARG TARGETPLATFORM
# We need the target arch triplet in both Debian and rust flavor
RUN echo "DEBIAN_ARCH_TRIPLET='$(dpkg-architecture -A${TARGETPLATFORM#linux/} -qDEB_TARGET_MULTIARCH)'" >>/root/dynenv
RUN . /root/dynenv && \
echo "RUST_ARCH_TRIPLET='$(echo "$DEBIAN_ARCH_TRIPLET" | sed -E 's/-linux-/-unknown&/')'" >>/root/dynenv
WORKDIR /root WORKDIR /root
# Copy source tree # Copy source tree
COPY . . COPY . .
RUN test -x build/duniter || \ RUN apt-get update && \
( \ DEBIAN_FRONTEND=noninteractive apt-get install -y clang cmake protobuf-compiler
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y clang cmake protobuf-compiler \
)
# build duniter # build duniter
ARG threads=1 ARG debug=0
RUN test -x build/duniter || \ RUN if [ "$debug" = 0 ]; then \
( \ echo "CARGO_PROFILE_RELEASE_LTO=true; export CARGO_PROFILE_RELEASE_LTO" >>/root/dynenv && \
CARGO_PROFILE_RELEASE_LTO="true" \ echo "CARGO_OPTIONS=--release" >>/root/dynenv && \
cargo build --release -j $threads && \ echo "TARGET_FOLDER=release" >>/root/dynenv; \
mkdir -p build && \ else \
mv target/release/duniter build/ \ echo "TARGET_FOLDER=debug" >>/root/dynenv; \
) fi
# Configure cross-build environment if need be
RUN set -x && \
if [ "$TARGETPLATFORM" != "$BUILDPLATFORM" ]; then \
. /root/dynenv && \
apt install -y gcc-$DEBIAN_ARCH_TRIPLET binutils-$DEBIAN_ARCH_TRIPLET && \
rustup target add "$RUST_ARCH_TRIPLET" && \
: https://github.com/rust-lang/cargo/issues/4133 && \
echo "RUSTFLAGS='-C linker=$DEBIAN_ARCH_TRIPLET-gcc'; export RUSTFLAGS" >>/root/dynenv; \
fi
# Create fake duniter-cucumber if is not exist # Build
# The goal is to avoid error later, this binary is optional RUN set -x && \
RUN test -x build/duniter-cucumber || \ cat /root/dynenv && \
( \ . /root/dynenv && \
cargo build --locked $CARGO_OPTIONS --target "$RUST_ARCH_TRIPLET" && \
mkdir -p build && \ mkdir -p build && \
touch build/duniter-cucumber \ mv target/$RUST_ARCH_TRIPLET/$TARGET_FOLDER/duniter build/
)
# Run tests if requested, expted when cross-building
ARG cucumber=0
RUN if [ "$cucumber" != 0 ] && [ "$TARGETPLATFORM" = "$BUILDPLATFORM" ]; then \
cargo test --workspace --exclude duniter-end2end-tests --exclude duniter-live-tests && \
cargo cucumber -i account_creation* && \
cargo cucumber -i certification* && \
cargo cucumber -i identity_creation* && \
cargo cucumber -i monetary_mass* && \
cargo cucumber -i oneshot_account* && \
cargo cucumber -i transfer_all* && \
cd target/debug/deps/ && \
rm cucumber_tests-*.d && \
mv cucumber_tests* ../../../build/duniter-cucumber; \
fi
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Final Stage # Final Stage
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
FROM debian:buster-slim FROM debian:bullseye-slim
LABEL maintainer="Gilles Filippini <gilles.filippini@pini.fr>" LABEL maintainer="Gilles Filippini <gilles.filippini@pini.fr>"
LABEL version="0.0.0" LABEL version="0.0.0"
...@@ -55,6 +87,5 @@ ENTRYPOINT ["docker-entrypoint"] ...@@ -55,6 +87,5 @@ ENTRYPOINT ["docker-entrypoint"]
USER duniter USER duniter
# Intall # Intall
COPY --from=build /root/build/duniter /usr/local/bin/duniter COPY --from=build /root/build /usr/local/bin/
COPY --from=build /root/build/duniter-cucumber /usr/local/bin/duniter-cucumber
COPY docker/docker-entrypoint /usr/local/bin/ COPY docker/docker-entrypoint /usr/local/bin/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment