From 5d5cd7d3b1526796981d72b2683f308aeb7c2965 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 17:15:35 +0200
Subject: [PATCH 01/28] migrate CI to forgejo
---
.gitlab-ci.yml => .gitlab-ci.yml.old | 0
.woodpecker.yml | 18 ++++++++++++++++++
2 files changed, 18 insertions(+)
rename .gitlab-ci.yml => .gitlab-ci.yml.old (100%)
create mode 100644 .woodpecker.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml.old
similarity index 100%
rename from .gitlab-ci.yml
rename to .gitlab-ci.yml.old
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..bb51948
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1,18 @@
+pipeline:
+ docker-master:
+ group: docker
+ image: docker:stable
+ environment:
+ - DOCKER_HOST=tcp://docker:2375
+ commands:
+ - docker --tls=false ps
+ when:
+ event:
+ - push
+ branch: 'master'
+
+ services:
+ docker:
+ image: docker:dind
+ command: [ "--storage-driver=vfs", "--tls=false" ]
+ privileged: true
\ No newline at end of file
From 51b31ac9155e984bc5637b504864adb88db3f999 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 17:18:40 +0200
Subject: [PATCH 02/28] migrate CI to forgejo
---
.woodpecker.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index bb51948..b67ba99 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,8 +11,8 @@ pipeline:
- push
branch: 'master'
- services:
- docker:
- image: docker:dind
- command: [ "--storage-driver=vfs", "--tls=false" ]
- privileged: true
\ No newline at end of file
+services:
+ docker:
+ image: docker:dind
+ command: [ "--storage-driver=vfs", "--tls=false" ]
+ privileged: true
From 624c78089708bf5072f3f31fc0b58ee8e4749d23 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 17:38:14 +0200
Subject: [PATCH 03/28] migrate CI to forgejo
---
.woodpecker.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index b67ba99..27db0dc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -14,5 +14,4 @@ pipeline:
services:
docker:
image: docker:dind
- command: [ "--storage-driver=vfs", "--tls=false" ]
- privileged: true
+ commands: [ "--storage-driver=vfs", "--tls=false" ]
From b4068cf438b31e860f2f5b2019c051b527b21e6c Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 17:41:44 +0200
Subject: [PATCH 04/28] migrate CI to forgejo
---
.woodpecker.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 27db0dc..6404f18 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,10 +2,10 @@ pipeline:
docker-master:
group: docker
image: docker:stable
- environment:
- - DOCKER_HOST=tcp://docker:2375
+# environment:
+# - DOCKER_HOST=tcp://docker:2375
commands:
- - docker --tls=false ps
+ - docker ps
when:
event:
- push
@@ -14,4 +14,4 @@ pipeline:
services:
docker:
image: docker:dind
- commands: [ "--storage-driver=vfs", "--tls=false" ]
+# commands: [ "--storage-driver=vfs", "--tls=false" ]
From 9eb1b24f01b292b51217bd5ac08031b47c0c36bc Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 17:44:17 +0200
Subject: [PATCH 05/28] migrate CI to forgejo
---
.woodpecker.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6404f18..5111ff9 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,7 @@
pipeline:
docker-master:
- group: docker
- image: docker:stable
+# group: docker
+ image: plugins/docker
# environment:
# - DOCKER_HOST=tcp://docker:2375
commands:
@@ -11,7 +11,7 @@ pipeline:
- push
branch: 'master'
-services:
- docker:
- image: docker:dind
-# commands: [ "--storage-driver=vfs", "--tls=false" ]
+#services:
+# docker:
+# image: docker:dind
+## commands: [ "--storage-driver=vfs", "--tls=false" ]
From 2d892c8843b3870e735860ae2dd6ab54193edf10 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sun, 23 Apr 2023 20:09:10 +0200
Subject: [PATCH 06/28] migrate CI to forgejo
---
.woodpecker.yml | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5111ff9..b4f95af 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,17 +1,20 @@
pipeline:
- docker-master:
-# group: docker
- image: plugins/docker
-# environment:
-# - DOCKER_HOST=tcp://docker:2375
+ env-info:
+ image: ubuntu:latest
commands:
- - docker ps
+ - printenv
+
+ docker-master:
+ image: plugins/docker
+ settings:
+ repo: tphoney/test
+ tags: latest
+ secret: id=mysecret,src=secret-file
+ username:
+ from_secret: docker_username
+ password:
+ from_secret: docker_password
when:
event:
- push
branch: 'master'
-
-#services:
-# docker:
-# image: docker:dind
-## commands: [ "--storage-driver=vfs", "--tls=false" ]
From f30a830236c57e1fd74d050e32ea7ded821cf670 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:27:05 +0200
Subject: [PATCH 07/28] migrate CI to forgejo
---
.woodpecker.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index b4f95af..6b337fc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,9 +7,8 @@ pipeline:
docker-master:
image: plugins/docker
settings:
- repo: tphoney/test
+ repo: $CI_REPO
tags: latest
- secret: id=mysecret,src=secret-file
username:
from_secret: docker_username
password:
From fc184720e6e369ba928439052aefa4c5c7a1c4d6 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:28:44 +0200
Subject: [PATCH 08/28] migrate CI to forgejo
---
.woodpecker.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6b337fc..5c39d0b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,6 +9,7 @@ pipeline:
settings:
repo: $CI_REPO
tags: latest
+ registry: git.van-hemmen.com
username:
from_secret: docker_username
password:
From 715d35911ccdc85935fc24a59cf4378909d5f8aa Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:40:01 +0200
Subject: [PATCH 09/28] migrate CI to forgejo
---
.woodpecker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5c39d0b..adfc1d9 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,7 +7,7 @@ pipeline:
docker-master:
image: plugins/docker
settings:
- repo: $CI_REPO
+ repo: guillaumehemmen/sonar-scanner
tags: latest
registry: git.van-hemmen.com
username:
From e7fa01a4f865fe542220094ad1f5f1d355b0ac93 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:41:47 +0200
Subject: [PATCH 10/28] migrate CI to forgejo
---
.woodpecker.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index adfc1d9..72950b6 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,9 +7,8 @@ pipeline:
docker-master:
image: plugins/docker
settings:
- repo: guillaumehemmen/sonar-scanner
+ repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
tags: latest
- registry: git.van-hemmen.com
username:
from_secret: docker_username
password:
From b928898252757018d9eb9b9faccceccb4b1b6115 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:42:04 +0200
Subject: [PATCH 11/28] migrate CI to forgejo
---
.woodpecker.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 72950b6..79288d7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -9,6 +9,7 @@ pipeline:
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
tags: latest
+ registry: git.van-hemmen.com
username:
from_secret: docker_username
password:
From 5496864b2bc5fba6a32e4d5775a67ec00345e502 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:45:19 +0200
Subject: [PATCH 12/28] migrate CI to forgejo
---
.woodpecker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 79288d7..6927d48 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,7 +8,7 @@ pipeline:
image: plugins/docker
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
- tags: latest
+ tags: latest,$CI_COMMIT
registry: git.van-hemmen.com
username:
from_secret: docker_username
From 1e71bd09d602a1603e093f76d17874decd986363 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 18:47:12 +0200
Subject: [PATCH 13/28] migrate CI to forgejo
---
.woodpecker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6927d48..867c21f 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,7 +8,7 @@ pipeline:
image: plugins/docker
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
- tags: latest,$CI_COMMIT
+ tags: latest,${CI_COMMIT}
registry: git.van-hemmen.com
username:
from_secret: docker_username
From dc425857e886767e0049c387eb087585d194b9a6 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 19:15:04 +0200
Subject: [PATCH 14/28] migrate CI to forgejo
---
.woodpecker.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 867c21f..7a84db2 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,3 +18,18 @@ pipeline:
event:
- push
branch: 'master'
+
+ docker-tag:
+ image: plugins/docker
+ settings:
+ repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
+ tags: latest
+ registry: git.van-hemmen.com
+ username:
+ from_secret: docker_username
+ password:
+ from_secret: docker_password
+ when:
+ event:
+ - tag
+ branch: 'master'
From af3589a64e08b34efc608ddcd587738248299aa2 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 24 Apr 2023 19:20:07 +0200
Subject: [PATCH 15/28] migrate CI to forgejo
---
.woodpecker.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7a84db2..5007616 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -23,7 +23,7 @@ pipeline:
image: plugins/docker
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
- tags: latest
+ tags: latest,${CI_TAG}
registry: git.van-hemmen.com
username:
from_secret: docker_username
@@ -32,4 +32,3 @@ pipeline:
when:
event:
- tag
- branch: 'master'
From 82884bd2d614b926155944843f6bc0e6a40df9af Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<guillaumehemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:28:39 +0100
Subject: [PATCH 16/28] Update Dockerfile
---
Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 67d0a74..417183e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM node:16
+FROM node:18
LABEL maintainer="guillaume@van-hemmen.com"
RUN apt-get update && \
apt-get -y install wget unzip && \
cd /root/ && \
- wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.0.2856-linux.zip && \
- unzip sonar-scanner-cli-4.8.0.2856-linux.zip && \
- ln -sf /root/sonar-scanner-4.8.0.2856-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
+ wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.1.3023-linux.zip && \
+ unzip sonar-scanner-cli-4.8.1.3023-linux.zip && \
+ ln -sf /root/sonar-scanner-4.8.1.3023-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
From 9aeecf2f7ab0457b6f70adc8acd14ddc8001d7b5 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<guillaumehemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:29:24 +0100
Subject: [PATCH 17/28] Update .woodpecker.yml
---
.woodpecker.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5007616..e327d68 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,7 +5,7 @@ pipeline:
- printenv
docker-master:
- image: plugins/docker
+ image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
tags: latest,${CI_COMMIT}
@@ -20,7 +20,7 @@ pipeline:
branch: 'master'
docker-tag:
- image: plugins/docker
+ image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
tags: latest,${CI_TAG}
From 19fb7448b4b220eb90f6ddaabf7e9f4fe5a8c9fd Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<guillaumehemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:29:51 +0100
Subject: [PATCH 18/28] Update .woodpecker.yml
---
.woodpecker.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index e327d68..346ce6b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,4 +1,4 @@
-pipeline:
+steps:
env-info:
image: ubuntu:latest
commands:
From 5391d631f1d3022910f2afea202656cae57a4aea Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<guillaumehemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:30:51 +0100
Subject: [PATCH 19/28] Update .woodpecker.yml
---
.woodpecker.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 346ce6b..843969c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,8 +1,4 @@
steps:
- env-info:
- image: ubuntu:latest
- commands:
- - printenv
docker-master:
image: woodpeckerci/plugin-docker-buildx
From f4b433d0c8492a55f679f233ae666c11a87e734f Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:37:53 +0100
Subject: [PATCH 20/28] #0000 - fix issue with build CI
---
.woodpecker.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 843969c..8f7f5f4 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,6 +1,6 @@
steps:
- docker-master:
+ build-docker-master:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
@@ -15,7 +15,7 @@ steps:
- push
branch: 'master'
- docker-tag:
+ build-docker-tag:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
From b34b6d33f4f6c8b1d7d30af6fc4408fe5771779e Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 18:40:03 +0100
Subject: [PATCH 21/28] #0000 - fix issue with build CI
---
.woodpecker.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 8f7f5f4..843969c 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,6 +1,6 @@
steps:
- build-docker-master:
+ docker-master:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
@@ -15,7 +15,7 @@ steps:
- push
branch: 'master'
- build-docker-tag:
+ docker-tag:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
From 8048dc7a611371e75056a14ac955448644ccf403 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 19:25:45 +0100
Subject: [PATCH 22/28] #0000 - bump sonar cli to 5.0.1.3006
---
Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 417183e..953d510 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,6 @@ LABEL maintainer="guillaume@van-hemmen.com"
RUN apt-get update && \
apt-get -y install wget unzip && \
cd /root/ && \
- wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.1.3023-linux.zip && \
- unzip sonar-scanner-cli-4.8.1.3023-linux.zip && \
- ln -sf /root/sonar-scanner-4.8.1.3023-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
+ wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip && \
+ unzip sonar-scanner-cli-5.0.1.3006-linux.zip && \
+ ln -sf /root/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
From 894c848c249da90df7e421e8a2824fe90377038f Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 20:16:28 +0100
Subject: [PATCH 23/28] #0000 - bump sonar cli to 5.0.1.3006
---
.woodpecker.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 843969c..cbc406b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -13,6 +13,7 @@ steps:
when:
event:
- push
+ - manual
branch: 'master'
docker-tag:
From 626d91d9c0e08c8f77f82bfcf5e3431b5fcd69ba Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 20:17:38 +0100
Subject: [PATCH 24/28] #0000 - dump installed version at the end of the pipe
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 953d510..747805a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,5 @@ RUN apt-get update && \
cd /root/ && \
wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip && \
unzip sonar-scanner-cli-5.0.1.3006-linux.zip && \
- ln -sf /root/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
+ ln -sf /root/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner && \
+ /usr/local/bin/sonar-scanner --version
From eaedf50f1ce7828422defffb0d88e27dd5f3f1d2 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 20:20:22 +0100
Subject: [PATCH 25/28] #0000 - add envinfo
---
.woodpecker.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index cbc406b..2cdca97 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,4 +1,8 @@
steps:
+ env-info:
+ image: ubuntu:latest
+ commands:
+ - printenv
docker-master:
image: woodpeckerci/plugin-docker-buildx
From d3575ea71a6ec8b9410ab9b798a57b82ecd33873 Mon Sep 17 00:00:00 2001
From: "Guillaume \"B.B.\" Van Hemmen"
<GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Sat, 4 Nov 2023 20:21:21 +0100
Subject: [PATCH 26/28] #0000 - fix env variables
---
.woodpecker.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2cdca97..f921bb6 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,7 +8,7 @@ steps:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
- tags: latest,${CI_COMMIT}
+ tags: latest,${CI_COMMIT_SHA}
registry: git.van-hemmen.com
username:
from_secret: docker_username
@@ -24,7 +24,7 @@ steps:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner
- tags: latest,${CI_TAG}
+ tags: latest,${CI_COMMIT_TAG}
registry: git.van-hemmen.com
username:
from_secret: docker_username
From 2f3f02ae5ae34e7f8d8810b9367f16a01f80bfea Mon Sep 17 00:00:00 2001
From: "Guillaume B.B. Van Hemmen" <GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 19 May 2025 20:19:02 +0200
Subject: [PATCH 27/28] Add CI workflows and update Dockerfile dependencies
Introduce GitHub Actions workflows for building and pushing Docker images on master branch pushes and tag pushes. Update Dockerfile base image to Node.js 22 and upgrade Sonar Scanner CLI to version 7.1.0 for improved compatibility and features.
---
.forgejo/workflows/docker-master.yaml | 23 +++++++++++++++++++++++
.forgejo/workflows/docker-tag.yaml | 23 +++++++++++++++++++++++
Dockerfile | 8 ++++----
3 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 .forgejo/workflows/docker-master.yaml
create mode 100644 .forgejo/workflows/docker-tag.yaml
diff --git a/.forgejo/workflows/docker-master.yaml b/.forgejo/workflows/docker-master.yaml
new file mode 100644
index 0000000..f731b84
--- /dev/null
+++ b/.forgejo/workflows/docker-master.yaml
@@ -0,0 +1,23 @@
+on:
+ push:
+ branches:
+ - 'master'
+jobs:
+ docker-master:
+ runs-on: docker
+ container:
+ image: git.van-hemmen.com/actions/kaniko:25.21.1
+ steps:
+ - name: Build & push with Kaniko
+ run: /bin/build.sh
+ env:
+ # --- mandatory --------------------------------------------------------
+ KANIKO_CONTEXT: git://git.van-hemmen.com/GuillaumeHemmen/sonar-scanner.git
+ GIT_REF_NAME: ${{ github.ref_name }}
+ GIT_USERNAME: ${{ secrets.docker_username }}
+ GIT_PASSWORD: ${{ secrets.access_token }}
+
+ # --- optional (only needed when you plan to push) ---------------------
+ REGISTRY_USER: ${{ secrets.docker_username }}
+ REGISTRY_PASS: ${{ secrets.access_token }}
+ KANIKO_DESTINATION: git.van-hemmen.com/guillaumehemmen/sonar-scanner:${GITHUB_SHA},git.van-hemmen.com/guillaumehemmen/sonar-scanner:latest
diff --git a/.forgejo/workflows/docker-tag.yaml b/.forgejo/workflows/docker-tag.yaml
new file mode 100644
index 0000000..dadf1db
--- /dev/null
+++ b/.forgejo/workflows/docker-tag.yaml
@@ -0,0 +1,23 @@
+on:
+ push:
+ tags:
+ - '*'
+jobs:
+ docker-tag:
+ runs-on: docker
+ container:
+ image: git.van-hemmen.com/actions/kaniko:25.21.1
+ steps:
+ - name: Build & push with Kaniko
+ run: /bin/build.sh
+ env:
+ # --- mandatory --------------------------------------------------------
+ KANIKO_CONTEXT: git://git.van-hemmen.com/GuillaumeHemmen/sonar-scanner.git
+ GIT_REF_NAME: ${{ github.ref_name }}
+ GIT_USERNAME: ${{ secrets.docker_username }}
+ GIT_PASSWORD: ${{ secrets.access_token }}
+
+ # --- optional (only needed when you plan to push) ---------------------
+ REGISTRY_USER: ${{ secrets.docker_username }}
+ REGISTRY_PASS: ${{ secrets.access_token }}
+ KANIKO_DESTINATION: git.van-hemmen.com/guillaumehemmen/sonar-scanner:${GITHUB_REF_NAME},git.van-hemmen.com/guillaumehemmen/sonar-scanner:latest
diff --git a/Dockerfile b/Dockerfile
index 747805a..b13a88b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM node:18
+FROM node:22
LABEL maintainer="guillaume@van-hemmen.com"
RUN apt-get update && \
apt-get -y install wget unzip && \
cd /root/ && \
- wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip && \
- unzip sonar-scanner-cli-5.0.1.3006-linux.zip && \
- ln -sf /root/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner && \
+ wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-7.1.0.4889-linux-x64.zip && \
+ unzip sonar-scanner-cli-7.1.0.4889-linux-x64.zip && \
+ ln -sf /root/sonar-scanner-cli-7.1.0.4889-linux-x64/bin/sonar-scanner /usr/local/bin/sonar-scanner && \
/usr/local/bin/sonar-scanner --version
From bd53914cc31e105c7122ef068183fad4d9071030 Mon Sep 17 00:00:00 2001
From: "Guillaume B.B. Van Hemmen" <GuillaumeHemmen@noreply.git.van-hemmen.com>
Date: Mon, 19 May 2025 20:24:05 +0200
Subject: [PATCH 28/28] Update symlink path for Sonar Scanner in Dockerfile
Corrected the symlink path to align with the extracted directory name. This ensures the Sonar Scanner binary is properly accessible from the expected location.
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index b13a88b..c3ba1ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,5 @@ RUN apt-get update && \
cd /root/ && \
wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-7.1.0.4889-linux-x64.zip && \
unzip sonar-scanner-cli-7.1.0.4889-linux-x64.zip && \
- ln -sf /root/sonar-scanner-cli-7.1.0.4889-linux-x64/bin/sonar-scanner /usr/local/bin/sonar-scanner && \
+ ln -sf /root/sonar-scanner-7.1.0.4889-linux-x64/bin/sonar-scanner /usr/local/bin/sonar-scanner && \
/usr/local/bin/sonar-scanner --version