Migration to GitHub Actions and image namespace update

2022-04-26 23:32:52 +02:00
parent 05b0ef567e
commit 40978527b9
11 changed files with 168 additions and 139 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,25 +0,0 @@
-name: 'CI'
-
-on:
-  push:
-    tags: ['*']
-    branches: ['*']
-  pull_request:
-    branches: ['*']
-  workflow_dispatch:
-
-jobs:
-
-  build:
-    name: 'Build ${{ matrix.arch }} image'
-    runs-on: 'ubuntu-latest'
-    strategy:
-      matrix:
-        arch: ['amd64', 'arm64v8']
-    steps:
-      - name: 'Checkout project'
-        uses: 'actions/checkout@v3'
-      - name: 'Build image'
-        run: |
-          make binfmt-register
-          make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -0,0 +1,110 @@
+name: 'Main'
+
+on:
+  push:
+    tags: ['*']
+    branches: ['*']
+  pull_request:
+    branches: ['*']
+  workflow_dispatch:
+
+jobs:
+
+  build:
+    name: 'Build ${{ matrix.arch }} image'
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'read'
+    strategy:
+      matrix:
+        arch: ['native', 'amd64', 'arm64v8']
+    steps:
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Register binfmt entries'
+        if: "matrix.arch != 'native'"
+        run: |
+          make binfmt-register
+      - name: 'Build and save image'
+        run: |
+          make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
+      - name: 'Upload artifacts'
+        if: "startsWith(github.ref, 'refs/tags/v')"
+        uses: 'actions/upload-artifact@v3'
+        with:
+          name: 'dist-${{ matrix.arch }}'
+          path: './dist/'
+          retention-days: 1
+
+  push:
+    name: 'Push ${{ matrix.arch }} image'
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: ['build']
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'read'
+    strategy:
+      matrix:
+        arch: ['amd64', 'arm64v8']
+    steps:
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Download artifacts'
+        uses: 'actions/download-artifact@v3'
+        with:
+          name: 'dist-${{ matrix.arch }}'
+          path: './dist/'
+      - name: 'Login to Docker Hub'
+        uses: 'docker/login-action@v1'
+        with:
+          registry: 'docker.io'
+          username: '${{ secrets.DOCKERHUB_USERNAME }}'
+          password: '${{ secrets.DOCKERHUB_TOKEN }}'
+      - name: 'Load and push image'
+        run: |
+          make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
+
+  push-manifest:
+    name: 'Push manifest'
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: ['push']
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'read'
+    steps:
+      - name: 'Checkout project'
+        uses: 'actions/checkout@v3'
+      - name: 'Login to Docker Hub'
+        uses: 'docker/login-action@v1'
+        with:
+          registry: 'docker.io'
+          username: '${{ secrets.DOCKERHUB_USERNAME }}'
+          password: '${{ secrets.DOCKERHUB_TOKEN }}'
+      - name: 'Push manifest'
+        run: |
+          make push-cross-manifest
+
+  release-github:
+    name: 'Create GitHub release'
+    if: "startsWith(github.ref, 'refs/tags/v')"
+    needs: ['push-manifest']
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'write'
+    steps:
+      - name: 'Create release'
+        run: |
+          RELEASE_STATUS="$(curl -fs --proto '=https' --tlsv1.3 --globoff \
+            --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/releases/tags/${GITHUB_REF_NAME:?}" \
+            --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+            --header 'Accept: application/vnd.github.v3+json' \
+            --header 'Content-Type: application/json' \
+            --write-out '%{http_code}' --output /dev/null ||:)"
+          if [ "${RELEASE_STATUS:?}" = '200' ]; then exit 0; fi
+          RELEASE_ID="$(curl -fsS --proto '=https' --tlsv1.3 --globoff \
+            --url "https://api.github.com/repos/${GITHUB_REPOSITORY:?}/releases" \
+            --header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
+            --header 'Accept: application/vnd.github.v3+json' \
+            --header 'Content-Type: application/json' \
+            --data "$(jq -rn --arg tag "${GITHUB_REF_NAME:?}" '{"name": $tag, "tag_name": $tag, "generate_release_notes": true}')" | jq -r '.id')"
+          if [ -z "${RELEASE_ID-}" ] || [ "${RELEASE_ID:?}" = 'null' ]; then exit 1; fi
--- a/.github/workflows/rebuild-latest-release.yml
+++ b/.github/workflows/rebuild-latest-release.yml
@@ -0,0 +1,33 @@
+name: 'Rebuild latest release'
+
+on:
+  schedule:
+    - cron: '20 04 * * 1'
+  workflow_dispatch:
+
+jobs:
+
+  trigger-rebuild:
+    name: 'Trigger rebuild'
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'read'
+    steps:
+      - name: 'REST API call'
+        run: |
+          RELEASE_TAG="$(curl -fsS --proto '=https' --tlsv1.3 --globoff \
+              --url 'https://api.github.com/repos/${{ github.repository }}/releases/latest' \
+              --header 'Authorization: Bearer ${{ secrets.PERSONAL_GITHUB_TOKEN }}' \
+              --header 'Accept: application/vnd.github.v3+json' \
+              --header 'Content-Type: application/json' \
+                | jq -rc '.tag_name')"
+          if [ -n "${RELEASE_TAG-}" ] && [ "${RELEASE_TAG:?}" != 'null' ]; then
+            curl -fsS --proto '=https' --tlsv1.3 --globoff \
+              --url 'https://api.github.com/repos/${{ github.repository }}/actions/workflows/main.yml/dispatches' \
+              --header 'Authorization: Bearer ${{ secrets.PERSONAL_GITHUB_TOKEN }}' \
+              --header 'Accept: application/vnd.github.v3+json' \
+              --header 'Content-Type: application/json' \
+              --data "$(jq -rn --arg tag "${RELEASE_TAG:?}" '{"ref": $tag}')"
+          else
+            exit 1
+          fi
--- a/.github/workflows/trigger-rebuild-latest-release.yml
+++ b/.github/workflows/trigger-rebuild-latest-release.yml
@@ -1,26 +0,0 @@
-name: 'Trigger rebuild of latest release'
-
-on:
-  schedule:
-    - cron: '20 04 * * 1'
-  workflow_dispatch:
-
-jobs:
-
-  trigger-rebuild:
-    name: 'Trigger rebuild'
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'REST API call'
-        run: |
-          curl -fsS --proto '=https' --tlsv1.3 \
-            --url 'https://api.github.com/repos/${{ github.repository }}/actions/workflows/ci.yml/dispatches' \
-            --header 'Authorization: Bearer ${{ secrets.PERSONAL_GITHUB_TOKEN }}' \
-            --header 'Accept: application/vnd.github.v3+json' \
-            --header 'Content-Type: application/json' \
-            --data "$(curl -fsS --proto '=https' --tlsv1.3 \
-              --url 'https://api.github.com/repos/${{ github.repository }}/releases/latest' \
-              --header 'Authorization: Bearer ${{ secrets.PERSONAL_GITHUB_TOKEN }}' \
-              --header 'Accept: application/vnd.github.v3+json' \
-              --header 'Content-Type: application/json' \
-                | jq -rc '{ ref: .tag_name }')"
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,74 +0,0 @@
-stages:
-  - 'build'
-  - 'push'
-
-variables:
-  DOCKER_HOST: 'tcp://dockerd:2376'
-  DOCKER_TLS_SAN: 'DNS:dockerd'
-  DOCKER_TLS_CERTDIR: '/certs'
-  DOCKER_DRIVER: 'overlay2'
-
-default:
-  image: 'docker.io/docker:latest'
-  services:
-    - name: 'docker.io/docker:dind'
-      alias: 'dockerd'
-
-.anchors:
-  - &cmd_install_packages 'apk add --no-cache coreutils git m4 make zstd'
-  - &cmd_docker_login_registry 'docker login -u "${CI_REGISTRY_USER:?}" -p "${CI_REGISTRY_PASSWORD:?}" "${CI_REGISTRY:?}"'
-  - &matrix_arch ['amd64', 'arm64v8']
-  - &regex_version '/^v[0-9]+$/'
-
-build:native:
-  stage: 'build'
-  except: [*regex_version]
-  before_script:
-    - *cmd_install_packages
-  script:
-    - 'make IMAGE_BUILD_OPTS="--pull" build-native-image save-native-image'
-  artifacts:
-    expire_in: '1 day'
-    paths:
-      - './dist/'
-
-build:cross:
-  stage: 'build'
-  only: [*regex_version]
-  parallel:
-    matrix:
-      - ARCH: *matrix_arch
-  before_script:
-    - *cmd_install_packages
-  script:
-    - 'make binfmt-register'
-    - 'make IMAGE_BUILD_OPTS="--pull" "build-${ARCH:?}-image" "save-${ARCH:?}-image"'
-  artifacts:
-    expire_in: '1 week'
-    paths:
-      - './dist/'
-
-push:cross:
-  stage: 'push'
-  needs: ['build:cross']
-  only: [*regex_version]
-  parallel:
-    matrix:
-      - ARCH: *matrix_arch
-  before_script:
-    - *cmd_install_packages
-    - *cmd_docker_login_registry
-  script:
-    - 'make "load-${ARCH:?}-image" "push-${ARCH:?}-image"'
-
-push:manifest:
-  stage: 'push'
-  needs: ['push:cross']
-  only: [*regex_version]
-  variables:
-    DOCKER_CLI_EXPERIMENTAL: 'enabled'
-  before_script:
-    - *cmd_install_packages
-    - *cmd_docker_login_registry
-  script:
-    - 'make push-cross-manifest'
--- a/Dockerfile.m4
+++ b/Dockerfile.m4
@@ -5,7 +5,7 @@ m4_changequote([[, ]])
 ##################################################

 m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:20.04]], [[FROM docker.io/ubuntu:20.04]]) AS build
-m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectormolinero/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])
+m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])

 # Install system packages
 RUN export DEBIAN_FRONTEND=noninteractive \
@@ -256,8 +256,8 @@ RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=9:999 --pkgrel
 ## "xubuntu" stage
 ##################################################

-m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:20.04]], [[FROM docker.io/ubuntu:20.04]]) AS xubuntu
-m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectormolinero/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])
+m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:20.04]], [[FROM docker.io/ubuntu:20.04]]) AS main
+m4_ifdef([[CROSS_QEMU]], [[COPY --from=docker.io/hectorm/qemu-user-static:latest CROSS_QEMU CROSS_QEMU]])

 # Install system packages
 RUN export DEBIAN_FRONTEND=noninteractive \
--- a/17
+++ b/17
@@ -11,10 +11,12 @@ DISTDIR := ./dist
 DOCKERFILE_TEMPLATE := ./Dockerfile.m4

 IMAGE_REGISTRY := docker.io
-IMAGE_NAMESPACE := hectormolinero
+IMAGE_NAMESPACE := hectorm
 IMAGE_PROJECT := xubuntu
 IMAGE_NAME := $(IMAGE_REGISTRY)/$(IMAGE_NAMESPACE)/$(IMAGE_PROJECT)
-IMAGE_VERSION := $(shell '$(GIT)' describe --abbrev=0 2>/dev/null || printf 'v0')
+IMAGE_GIT_TAG := $(shell '$(GIT)' tag -l --contains HEAD 2>/dev/null)
+IMAGE_GIT_SHA := $(shell '$(GIT)' rev-parse HEAD 2>/dev/null)
+IMAGE_VERSION := $(if $(IMAGE_GIT_TAG),$(IMAGE_GIT_TAG),$(if $(IMAGE_GIT_SHA),$(IMAGE_GIT_SHA),nil))

 IMAGE_BUILD_OPTS :=

@@ -98,7 +100,7 @@ $(IMAGE_ARM64V8_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
 ##################################################

 define save_image
-	'$(DOCKER)' save '$(1)' | zstd -T0 -19 > '$(2)'
+	'$(DOCKER)' save '$(1)' | zstd -T0 > '$(2)'
 endef

 .PHONY: save-native-image
@@ -194,7 +196,7 @@ push-cross-manifest:

 .PHONY: binfmt-register
 binfmt-register:
-	'$(DOCKER)' run --rm --privileged docker.io/hectormolinero/qemu-user-static:latest --reset
+	'$(DOCKER)' run --rm --privileged docker.io/hectorm/qemu-user-static:latest --reset

 ##################################################
 ## "version" target
@@ -202,12 +204,13 @@ binfmt-register:

 .PHONY: version
 version:
-	@if printf '%s' '$(IMAGE_VERSION)' | grep -q '^v[0-9]\{1,\}$$'; then \
-		NEW_IMAGE_VERSION=$$(awk -v 'v=$(IMAGE_VERSION)' 'BEGIN {printf "v%.0f", substr(v,2)+1}'); \
+	@LATEST_IMAGE_VERSION=$$('$(GIT)' describe --abbrev=0 2>/dev/null || printf 'v0'); \
+	if printf '%s' "$${LATEST_IMAGE_VERSION:?}" | grep -q '^v[0-9]\{1,\}$$'; then \
+		NEW_IMAGE_VERSION=$$(awk -v v="$${LATEST_IMAGE_VERSION:?}" 'BEGIN {printf("v%.0f", substr(v,2)+1)}'); \
 		'$(GIT)' commit --allow-empty -m "$${NEW_IMAGE_VERSION:?}"; \
 		'$(GIT)' tag -a "$${NEW_IMAGE_VERSION:?}" -m "$${NEW_IMAGE_VERSION:?}"; \
 	else \
-		>&2 printf 'Malformed version string: %s\n' '$(IMAGE_VERSION)'; \
+		>&2 printf 'Malformed version string: %s\n' "$${LATEST_IMAGE_VERSION:?}"; \
 		exit 1; \
 	fi

--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ docker run \
  --publish 3322:3322/tcp \
  --publish 3389:3389/tcp \
  --device /dev/dri:/dev/dri \
-  docker.io/hectormolinero/xubuntu:latest
+  docker.io/hectorm/xubuntu:latest
 ```

 ### Docker Compose
@@ -28,7 +28,7 @@ docker run \
 version: '3.9'
 services:
  xubuntu:
-    image: 'docker.io/hectormolinero/xubuntu:latest'
+    image: 'docker.io/hectorm/xubuntu:latest'
    shm_size: '2gb'
    ports:
      - '3322:3322/tcp'
--- a/run-with-xdummy.sh
+++ b/run-with-xdummy.sh
@@ -6,7 +6,7 @@ export LC_ALL=C
 DOCKER=$(command -v docker 2>/dev/null)

 IMAGE_REGISTRY=docker.io
-IMAGE_NAMESPACE=hectormolinero
+IMAGE_NAMESPACE=hectorm
 IMAGE_PROJECT=xubuntu
 IMAGE_TAG=latest
 IMAGE_NAME=${IMAGE_REGISTRY:?}/${IMAGE_NAMESPACE:?}/${IMAGE_PROJECT:?}:${IMAGE_TAG:?}
--- a/run.sh
+++ b/run.sh
@@ -6,7 +6,7 @@ export LC_ALL=C
 DOCKER=$(command -v docker 2>/dev/null)

 IMAGE_REGISTRY=docker.io
-IMAGE_NAMESPACE=hectormolinero
+IMAGE_NAMESPACE=hectorm
 IMAGE_PROJECT=xubuntu
 IMAGE_TAG=latest
 IMAGE_NAME=${IMAGE_REGISTRY:?}/${IMAGE_NAMESPACE:?}/${IMAGE_PROJECT:?}:${IMAGE_TAG:?}