chore: next release #5

Merged
jon_nfc merged 9 commits from development into master 2023-05-21 06:07:05 +00:00
5 changed files with 203 additions and 41 deletions
Showing only changes of commit 692457da01 - Show all commits

View File

@ -5,7 +5,7 @@ include:
ref: development
file:
- .gitlab-ci_common.yaml
- type/docker-image.gitlab-ci.yaml
- template/docker-image.gitlab-ci.yaml
variables:
@ -32,153 +32,153 @@ variables:
.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]"
# .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 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/.
# - 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 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
# #- 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
# # - 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
# # - 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 --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
# #- 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
- |
# # --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
# if [ "0$DOCKER_IMAGE_BUILD_TARGET_PLATFORMS" != "0" ]; then
echo "[DEBUG] building multiarch/specified arch image";
# 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 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;
# 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
# # 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_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 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;
# docker buildx imagetools inspect $DOCKER_IMAGE_BUILD_REGISTRY/$DOCKER_IMAGE_BUILD_NAME:$DOCKER_IMAGE_BUILD_TAG;
else
# else
echo "[DEBUG] building image";
# 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 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;
# 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
# 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
# Docker Container:
# extends: .build_docker_container