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 1/7] #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 2/7] #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 3/7] #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 4/7] #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 5/7] #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 6/7] 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 7/7] 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