Merge branch 'development'

chore: commit to stable

See merge request nofusscomputing/projects/docker-buildx-qemu!28 #2

.cz.yaml

@@ -4,4 +4,4 @@ commitizen:
   name: cz_conventional_commits
   tag_format: $major.$minor.$patch$prerelease
   update_changelog_on_bump: true
-  version: 0.1.0
+  version: 0.3.0

.gitlab-ci.yml

@@ -5,7 +5,7 @@ include:
     ref: development
     file:
       - .gitlab-ci_common.yaml
-      - type/docker-image.gitlab-ci.yaml
+      - template/automagic.gitlab-ci.yaml
 
 
 variables:
@@ -17,7 +17,14 @@ 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/386,linux/arm/v7,linux/arm/v6"
+  DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,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
+
+
+
+

.nfc_automation.yaml

@@ -0,0 +1,8 @@
+---
+
+role_git_conf:
+  gitlab:
+    submodule_branch: "development"
+    default_branch: development
+    mr_labels: ~"type::automation" ~"impact::0" ~"priority::0"
+    auto_merge: true

CHANGELOG.md

@@ -1,3 +1,37 @@
+## 0.3.0 (2023-11-09)
+
+### Features
+
+- **qemu-user-static**: [a068446e](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/a068446e26b9a936e0e26f3095db119cf177f5a1) - updated to ver 1:7.2+dfsg-7+deb12u2~bpo11+1 [ [!28](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/28) ]
+- **build**: [1a4ef6f8](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/1a4ef6f888d16ab2eb62e4c39c6c0125658da004) - update base image to debian:11.8-slim [ [!28](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/28) ]
+
+## 0.3.0rc0 (2023-09-02)
+
+### Features
+
+- **ci**: [21952f4c](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/21952f4cf0d08d877ce4bd443024a2de6c0ceb77) - use project gitlab-ci automagic template [ [!6](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/6) [#1](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/issues/1) ]
+
+## 0.2.0 (2023-05-21)
+
+### Bug Fixes
+
+- **qemu**: [698002d9](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/698002d9f48f7ca1f033aeec2fc848646f177e6d) - segfault on arm no longer occurs [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+- **docker**: [8ddf6194](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/8ddf6194c41a0f0991d7a66b9730f77c64c99c68) - removed spt for armv7 and i386 [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+
+### Continious Integration
+
+- **gitlab-ci**: [692457da](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/692457da01e5efa149ddbe16a3415880e3b60beb) - update to current HEAD [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+- [a00cfd60](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/a00cfd60b887a0354638c97608b513f4cdafacd7) - remove qemu from image [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+- [06b65d99](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/06b65d9919a6f0007cc347a75de6ab805635a4a9) - update to current gitlab-ci project dev head [ [!17](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/17) [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+
+### Documentaton / Guides
+
+- **readme**: [e49f78f7](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/e49f78f712ea84f7d411e8916b1a7f8b87b26e22) - added usage within gitlab-ci [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+
+### Features
+
+- **build**: [d352f0e8](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/commit/d352f0e899d5da43a23ebe25167718f947149cf4) - use debian slim [ [!4](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu/-/merge_requests/4) ]
+
 ## 0.1.0 (2023-05-15)
 
 ### Bug Fixes

Dockerfile

@@ -1,37 +0,0 @@
-FROM debian
-
-
-
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt --fix-broken install \
-  && apt install -y libc-bin locales-all
-
-
-
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get update && apt-get install -y \
-        apt-transport-https \
-        ca-certificates \
-        curl \
-        git \
-        gnupg2 \
-        software-properties-common \
-        python3 \
-        python3-pip || true
-
-
-# Install Docker and qemu
-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" && \
-    apt-get update && apt-get install -y \
-        docker-buildx-plugin \
-        docker-ce-cli \
-        binfmt-support \
-        qemu-user-static || true
-
-
-# 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)]"

README.md

@@ -28,7 +28,7 @@ This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/d
 
 **Development Branch** 
 
-![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45926238%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/docker-buildx-qemu-%2Fraw%2Fdevelopment%2F.cz.yaml)
+![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45926238%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/docker-buildx-qemu%2F-%2Fraw%2Fdevelopment%2F.cz.yaml)
 
 ----
 <br>
@@ -45,6 +45,23 @@ links:
 
 > This is a fork of https://gitlab.com/gdunstone/docker-buildx-qemu, which appears to be a fork of a fork. anyhow, updates are required. Credit to original and derivitive devs/contributors for getting it to the stage they had!!
 
+This docker image enables building of multi-architecture docker builds. It's designed to run within a CI environment.
+
+To use this image within Gitlab CI/CD Pipelines the following as a minimum is required within your `gitlab-ci.yaml` file, specifically the `before_script` section of your `docker buildx build` job:
+
+``` yaml
+before_script:
+  # see: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1861 
+  # on why this `docker run` is required. without it multiarch support doesnt work.
+  - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+  - 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 inspect --bootstrap
+```
+
+When the above is added to the `before_script` section of the docker container build job, Gitlab CI has been initialized for multi-architecture builds.
+
 
 ## Contributing
 All contributions for this project must conducted from [Gitlab](https://gitlab.com/nofusscomputing/projects/docker-buildx-qemu).

dockerfile

@@ -0,0 +1,25 @@
+FROM --platform=$TARGETPLATFORM debian:11.8-slim
+
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+
+RUN apt-get update && apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        curl \
+        git \
+        gnupg2 \
+        software-properties-common \
+        python3 \
+        python3-pip
+
+
+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-static=1:7.2+dfsg-7+deb12u2~bpo11+1