From a00cfd60b887a0354638c97608b513f4cdafacd7 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 20 May 2023 15:22:06 +0930 Subject: [PATCH] ci: remove qemu from image !4 --- .gitlab-ci.yml | 160 ++++++++++++++++++++++++++++++++++++++++++++++++- Dockerfile | 19 ++++-- 2 files changed, 172 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab29b8d..0d8ab87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,10 +17,168 @@ variables: #JOB_STOP_GIT_PUSH_MIRROR: 'disable for testing' #JOB_STOP_GITLAB_RELEASE: 'disable for testing' - DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7" + #DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7" + DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/arm64,linux/amd64,linux/arm/v7" # Package docker-ce-cli is not available for: # - linux/arm/v6 # - linux/386 DOCKER_IMAGE_PUBLISH_NAME: $CI_PROJECT_NAME DOCKER_IMAGE_PUBLISH_REGISTRY: docker.io/nofusscomputing DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME + + + + + + + +.build_docker_container: + stage: build + image: nofusscomputing/docker-buildx-qemu:dev + services: + - name: docker:23-dind + entrypoint: ["env", "-u", "DOCKER_HOST"] + command: ["dockerd-entrypoint.sh"] + variables: + DOCKER_HOST: tcp://docker:2375/ + DOCKER_DRIVER: overlay2 + DOCKER_DOCKERFILE: Dockerfile + # See https://github.com/docker-library/docker/pull/166 + DOCKER_TLS_CERTDIR: "" + before_script: + - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=gitlab-ci; else ROOT_DIR=$JOB_ROOT_DIR ; fi + - echo "[DEBUG] ROOT_DIR[$ROOT_DIR]" + + - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + + - docker info + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + #- pip3 install -r gitlab-ci/gitlab_release/requirements.txt + - pip3 install setuptools wheel + - pip install -r $ROOT_DIR/conventional_commits/requirements.txt + - pip3 install gitlab-ci/gitlab_release/python-module/cz_nfc/. + + + # - apt install -y qemu-user=1:7.2+dfsg-7~bpo11+1 + - update-binfmts --display + - update-binfmts --enable # Important: Ensures execution of other binary formats is enabled in the kernel + #- docker buildx create --driver=docker-container --driver-opt image=moby/buildkit:v0.11.6 --use + - docker buildx create --driver=docker-container --use + - docker buildx inspect --bootstrap + # - ls -la /var/cache/ldconfig && rm -f /var/cache/ldconfig/aux-cache + # - /sbin/ldconfig && ls -la /var/cache/ldconfig + # - add-apt-repository "deb http://deb.debian.org/debian bullseye-backports main" + # - apt update + #- apt list --installed + + #- apt remove -y qemu-user-static + #- apt list --installed + + # - apt remove -y qemu-user-static + # - rm -f /var/cache/ldconfig/aux-cache + # - /sbin/ldconfig + # #- cp $(which qemu-aarch64-static) /usr/bin/qemu-aarch64 does nothing + # - apt install -y qemu-user=1:7.2+dfsg-7~bpo11+1 + # - update-binfmts --enable # Important: Ensures execution of other binary formats is enabled in the kernel + #- docker buildx create --driver=docker-container --driver-opt image=moby/buildkit:v0.11.6 --use + + # - ls -la /var/cache/ldconfig && rm -f /var/cache/ldconfig/aux-cache + # - /sbin/ldconfig && ls -la /var/cache/ldconfig + # - add-apt-repository "deb http://deb.debian.org/debian bullseye-backports main" + # - apt update + # - apt list --installed + # - apt install -y qemu-user-static=1:7.2+dfsg-7~bpo11+1 + # - apt remove -y qemu-user-static + + # - update-binfmts --display + # - apt list --installed + # - curl https://raw.githubusercontent.com/qemu/qemu/master/scripts/qemu-binfmt-conf.sh -o /qemu-binfmt-conf.sh + # - chmod +x /qemu-binfmt-conf.sh + # - mkdir -p /tester + # - /qemu-binfmt-conf.sh --exportdir /tester --debian --qemu-path /usr/bin + # - update-binfmts --importdir=/tester --import + # - update-binfmts --enable + #- update-binfmts --display + # - docker buildx create --driver=docker-container --use + # - docker buildx inspect --bootstrap + # - apt list --installed + # - apt remove -y qemu-user-static + # - curl https://raw.githubusercontent.com/qemu/qemu/master/scripts/qemu-binfmt-conf.sh -o /qemu-binfmt-conf.sh + # - chmod +x /qemu-binfmt-conf.sh + # - add-apt-repository "deb http://deb.debian.org/debian bullseye-backports main" + # - apt update + # - apt install -y qemu-user=1:7.2+dfsg-7~bpo11+1 + # - mkdir -p /tester + # - /qemu-binfmt-conf.sh --exportdir /tester --debian --qemu-path /usr/bin + # - update-binfmts --importdir=/tester --import + # - update-binfmts --enable + # - update-binfmts --display + + #- update-binfmts --enable + + + # --label org.opencontainers.image.url="$CI_PROJECT_URL/-/releases/$(cz -n cz_nfc version --project)" \ + # --label org.opencontainers.image.version="$(cz -n cz_nfc version --project)" \ + script: + #- update-binfmts --enable + - update-binfmts --display + - | + + if [ "0$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS" != "0" ]; then + + echo "[DEBUG] building multiarch/specified arch image"; + + docker buildx build --platform=$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS . \ + --label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \ + --label org.opencontainers.image.documentation="$CI_PROJECT_URL" \ + --label org.opencontainers.image.source="$CI_PROJECT_URL" \ + --label org.opencontainers.image.revision="$CI_COMMIT_SHA" \ + --push \ + --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --build-arg CI_PROJECT_ID=$CI_PROJECT_ID --build-arg CI_API_V4_URL=$CI_API_V4_URL \ + --file $DOCKER_DOCKERFILE \ + --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + # during docker multi platform build there are >=3 additional unknown images added to gitlab container registry. cleanup + + DOCKER_MULTI_ARCH_IMAGES=$(docker buildx imagetools inspect "$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG" --format "{{ range .Manifest.Manifests }}{{ if ne (print .Platform) \"&{unknown unknown [] }\" }}$DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG@{{ println .Digest }}{{end}} {{end}}"); + + docker buildx imagetools create $DOCKER_MULTI_ARCH_IMAGES --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + else + + echo "[DEBUG] building image"; + + docker build . \ + --label org.opencontainers.image.created="$(date '+%Y-%m-%d %H:%M:%S%:z')" \ + --label org.opencontainers.image.documentation="$CI_PROJECT_URL" \ + --label org.opencontainers.image.source="$CI_PROJECT_URL" \ + --label org.opencontainers.image.url="$CI_PROJECT_URL/-/releases/$(cz -n cz_nfc version --project)" \ + --label org.opencontainers.image.version="$(cz -n cz_nfc version --project)" \ + --label org.opencontainers.image.revision="$CI_COMMIT_SHA" \ + --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --build-arg CI_PROJECT_ID=$CI_PROJECT_ID --build-arg CI_API_V4_URL=$CI_API_V4_URL \ + --file $DOCKER_DOCKERFILE \ + --tag $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + docker push $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG; + + fi + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: never + - if: $CI_COMMIT_TAG + when: on_success + - if: '$CI_COMMIT_BRANCH == "development"' + when: on_success + - if: '$CI_COMMIT_BRANCH != "master"' + when: always + - when: never + + +Docker Container: + extends: .build_docker_container + + diff --git a/Dockerfile b/Dockerfile index 3158013..23a19b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,12 @@ -FROM debian:11.7 +FROM --platform=$TARGETPLATFORM debian:11.7 ARG DEBIAN_FRONTEND=noninteractive +RUN ls -la /var/cache/ldconfig && rm -f /var/cache/ldconfig/aux-cache + +RUN /sbin/ldconfig && ls -la /var/cache/ldconfig + RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update && apt-get install -y \ @@ -18,14 +22,17 @@ RUN export DEBIAN_FRONTEND=noninteractive \ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \ + add-apt-repository "deb http://deb.debian.org/debian bullseye-backports main" && \ apt-get update && apt-get install -y \ docker-buildx-plugin \ docker-ce-cli \ - binfmt-support=2.2.1-1+deb11u1 + #qemu-user + binfmt-support=2.2.1-1+deb11u1 \ + qemu-user-static=1:7.2+dfsg-7~bpo11+1 -# Write version file -RUN printf "$(docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.*),.*$/$1/')_$(docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')" > /version && \ - cat /version +# # Write version file +# RUN printf "$(docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.*),.*$/$1/')_$(docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')" > /version && \ +# cat /version -RUN echo "[DEBUG] why arm64 reports no docker 'which docker'=[$(which docker)]" \ No newline at end of file +# RUN echo "[DEBUG] why arm64 reports no docker 'which docker'=[$(which docker)]" \ No newline at end of file