From ef0539f264be67d19ba997ca9277edf546936586 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sun, 10 Aug 2025 22:04:31 +0200 Subject: [PATCH 01/17] Start. --- .woodpecker/build.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .woodpecker/build.yaml diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml new file mode 100644 index 0000000..ff6db23 --- /dev/null +++ b/.woodpecker/build.yaml @@ -0,0 +1,22 @@ +when: +- event: push + evaluate: $CI_SYSTEM_HOST == "forgejo.mnl.de" + +clone: +- name: git + image: woodpeckerci/plugin-git + settings: + partial: false + tags: true + depth: 0 + +steps: +- name: build + image: registry.mnl.de/org/jgrapes/jdk21-builder:v3 + environment: + REGISTRY: registry.mnl.de + REGISTRY_USER: mnl + REGISTRY_TOKEN: + from_secret: REGISTRY_TOKEN + commands: + - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs -- 2.49.1 From ba4ac0983bf2cd1487e44cbeb59d838d9733709e Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sun, 10 Aug 2025 22:06:04 +0200 Subject: [PATCH 02/17] Trigger. --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index ff6db23..7173fba 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -20,3 +20,4 @@ steps: from_secret: REGISTRY_TOKEN commands: - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs + \ No newline at end of file -- 2.49.1 From 726b99c572372c245745d565685449faf5d8976c Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sun, 10 Aug 2025 22:29:38 +0200 Subject: [PATCH 03/17] Test. --- .woodpecker/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 7173fba..4cf239f 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -1,6 +1,6 @@ when: - event: push - evaluate: $CI_SYSTEM_HOST == "forgejo.mnl.de" + # evaluate: $CI_SYSTEM_HOST == "forgejo.mnl.de" clone: - name: git @@ -19,5 +19,6 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: + - echo $CI_SYSTEM_HOST - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs \ No newline at end of file -- 2.49.1 From aa71a63d2d1549fa5c3fb22052cd80241163b89c Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Sun, 10 Aug 2025 22:31:28 +0200 Subject: [PATCH 04/17] Fix. --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 4cf239f..b04c68a 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -12,7 +12,7 @@ clone: steps: - name: build - image: registry.mnl.de/org/jgrapes/jdk21-builder:v3 + image: registry.mnl.de/mnl/jdk21-builder:v3 environment: REGISTRY: registry.mnl.de REGISTRY_USER: mnl -- 2.49.1 From cfe93fd27f1c3e218cddc995dd3048cb03d52d7d Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 10:19:17 +0200 Subject: [PATCH 05/17] Test publishing. --- .woodpecker/build.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b04c68a..3770e15 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -1,6 +1,6 @@ when: - event: push - # evaluate: $CI_SYSTEM_HOST == "forgejo.mnl.de" + evaluate: $CI_SYSTEM_HOST == "woodpecker.mnl.de" clone: - name: git @@ -11,7 +11,7 @@ clone: depth: 0 steps: -- name: build +- name: build-jars image: registry.mnl.de/mnl/jdk21-builder:v3 environment: REGISTRY: registry.mnl.de @@ -19,6 +19,4 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: - - echo $CI_SYSTEM_HOST - - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs - \ No newline at end of file + - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage -- 2.49.1 From f6867e07bf0a687a63eb1a21f159dec8a9858261 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 10:23:00 +0200 Subject: [PATCH 06/17] Fix condition. --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 3770e15..a9c6810 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -1,6 +1,6 @@ when: - event: push - evaluate: $CI_SYSTEM_HOST == "woodpecker.mnl.de" + evaluate: 'CI_SYSTEM_HOST == "woodpecker.mnl.de"' clone: - name: git -- 2.49.1 From dbf9dd0da5bc2f5115195c2f9dad95c6083288f6 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 10:29:33 +0200 Subject: [PATCH 07/17] Allow podman. --- .woodpecker/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index a9c6810..b506d4d 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -19,4 +19,12 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: + # Because we run this as user 1000 to make podman work: + - git config --global --add safe.directory $(pwd) - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage + backend_options: + kubernetes: + securityContext: + privileged: true + runAsUser: 1000 + runAsGroup: 1000 -- 2.49.1 From 6bb31d1cbfa64a024a9f38050d0363807f44965a Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 10:37:01 +0200 Subject: [PATCH 08/17] Try differently. --- .woodpecker/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b506d4d..aad6439 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -11,6 +11,12 @@ clone: depth: 0 steps: +- name: prepare + image: alpine + commands: + # Because we run the next step as user 1000 to make podman work: + - chown -R 1000:1000 . + - name: build-jars image: registry.mnl.de/mnl/jdk21-builder:v3 environment: @@ -19,8 +25,6 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: - # Because we run this as user 1000 to make podman work: - - git config --global --add safe.directory $(pwd) - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage backend_options: kubernetes: -- 2.49.1 From 096655a604ce9f05b99981f5ecf5ff6070a33486 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:00:38 +0200 Subject: [PATCH 09/17] Test. --- .woodpecker/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index aad6439..2708275 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -14,6 +14,7 @@ steps: - name: prepare image: alpine commands: + - pwd # Because we run the next step as user 1000 to make podman work: - chown -R 1000:1000 . @@ -25,6 +26,7 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: + - pwd - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage backend_options: kubernetes: -- 2.49.1 From 86f2ae1b7c6373fce06fc9dccef36bf9c972518e Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:03:10 +0200 Subject: [PATCH 10/17] Test. --- .woodpecker/build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 2708275..34d5376 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -15,6 +15,8 @@ steps: image: alpine commands: - pwd + - echo "Home $HOME" + - ls -la $HOME # Because we run the next step as user 1000 to make podman work: - chown -R 1000:1000 . @@ -27,6 +29,8 @@ steps: from_secret: REGISTRY_TOKEN commands: - pwd + - echo "Home $HOME" + - ls -la $HOME - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage backend_options: kubernetes: -- 2.49.1 From a256156a9a38a9e4aa9cc5d5b0584045c948868a Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:04:53 +0200 Subject: [PATCH 11/17] Try. --- .woodpecker/build.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 34d5376..c8b6802 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -14,11 +14,9 @@ steps: - name: prepare image: alpine commands: - - pwd - - echo "Home $HOME" - - ls -la $HOME # Because we run the next step as user 1000 to make podman work: - chown -R 1000:1000 . + - chown -R 1000:1000 $HOME - name: build-jars image: registry.mnl.de/mnl/jdk21-builder:v3 @@ -28,9 +26,6 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: - - pwd - - echo "Home $HOME" - - ls -la $HOME - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage backend_options: kubernetes: -- 2.49.1 From 4e9c2cae1d9d05f557837fe1cc7745b24222d62d Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:06:29 +0200 Subject: [PATCH 12/17] Test. --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index c8b6802..17b1e55 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -21,6 +21,7 @@ steps: - name: build-jars image: registry.mnl.de/mnl/jdk21-builder:v3 environment: + HOME: /root REGISTRY: registry.mnl.de REGISTRY_USER: mnl REGISTRY_TOKEN: -- 2.49.1 From 142d7c43e25cfd771163951556d28d476354ae5a Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:08:40 +0200 Subject: [PATCH 13/17] Test. --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 17b1e55..7c7b2a6 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -14,6 +14,7 @@ steps: - name: prepare image: alpine commands: + - sleep 10000 # Because we run the next step as user 1000 to make podman work: - chown -R 1000:1000 . - chown -R 1000:1000 $HOME -- 2.49.1 From 0be131046466eab6b1888977745ce63f7bb39fa8 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:18:27 +0200 Subject: [PATCH 14/17] Try. --- .woodpecker/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 7c7b2a6..dab8c91 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -14,15 +14,15 @@ steps: - name: prepare image: alpine commands: - - sleep 10000 # Because we run the next step as user 1000 to make podman work: - - chown -R 1000:1000 . - - chown -R 1000:1000 $HOME + - mkdir /woodpecker/workflow + - chown 1000:1000 /woodpecker/workflow + - chown -R 1000:1000 $CI_WORKSPACE - name: build-jars image: registry.mnl.de/mnl/jdk21-builder:v3 environment: - HOME: /root + HOME: /woodpecker/workflow REGISTRY: registry.mnl.de REGISTRY_USER: mnl REGISTRY_TOKEN: -- 2.49.1 From 85713f38891e5a0efcd9c1d91d4fc7c342728109 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:41:07 +0200 Subject: [PATCH 15/17] Test. --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index dab8c91..86e8345 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -20,7 +20,7 @@ steps: - chown -R 1000:1000 $CI_WORKSPACE - name: build-jars - image: registry.mnl.de/mnl/jdk21-builder:v3 + image: registry.mnl.de/mnl/jdk21-builder:v4 environment: HOME: /woodpecker/workflow REGISTRY: registry.mnl.de -- 2.49.1 From bae560dc7528cb7c8c823f798700fd8cdbc02662 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 11:46:29 +0200 Subject: [PATCH 16/17] Add login. --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 86e8345..56a575c 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -28,6 +28,7 @@ steps: REGISTRY_TOKEN: from_secret: REGISTRY_TOKEN commands: + - echo $REGISTRY_TOKEN | podman login -u $REGISTRY_USER --password-stdin $REGISTRY - ./gradlew -Pdocker.registry=$REGISTRY/$REGISTRY_USER build apidocs publishImage backend_options: kubernetes: -- 2.49.1 From c50446726ccdaaacd191a55e7dac0b17c7acfd6b Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Mon, 11 Aug 2025 12:44:46 +0200 Subject: [PATCH 17/17] Now deprecated. --- .gitlab-ci.yml | 78 -------------------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index b7b04f0..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,78 +0,0 @@ -stages: - - build - - test - - publish - - deploy - -.any-job: - rules: - - if: $CI_SERVER_HOST == "gitlab.mnl.de" - -.gradle-job: - extends: .any-job - image: registry.mnl.de/org/jgrapes/jdk21-builder:v2 - cache: - - key: dependencies-${CI_COMMIT_BRANCH} - policy: pull-push - paths: - - .gradle - - node_modules - - key: "$CI_COMMIT_SHA" - policy: pull-push - paths: - - build - - "*/build" - before_script: - - echo -n $CI_REGISTRY_PASSWORD | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY - - git switch $(git branch -r --sort="authordate" --contains $CI_COMMIT_SHA | head -1 | sed -e 's#.*/##') - - git pull - - git reset --hard $CI_COMMIT_SHA - -build-jars: - stage: build - extends: .gradle-job - script: - - ./gradlew -Pdocker.registry=$CI_REGISTRY_IMAGE build apidocs - -publish-images: - stage: publish - extends: .gradle-job - dependencies: - - build-jars - script: - - ./gradlew -Pdocker.registry=$CI_REGISTRY_IMAGE publishImage - -.pages-job: - extends: .any-job - image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/ruby:3.2 - variables: - JEKYLL_ENV: production - LC_ALL: C.UTF-8 - before_script: - - git fetch origin gh-pages - - git checkout gh-pages - - gem install bundler - - bundle install - -test-pages: - stage: test - extends: .pages-job - rules: - - if: $CI_COMMIT_BRANCH == "gh-pages" - script: - - bundle exec jekyll build -d test - artifacts: - paths: - - test - -#publish-pages: -# stage: publish -# extends: .pages-job -# rules: -# - if: $CI_COMMIT_BRANCH == "gh-pages" -# script: -# - bundle exec jekyll build -d public -# artifacts: -# paths: -# - public -# environment: production -- 2.49.1