diff --git a/.forgejo/workflows/docker-master.yaml b/.forgejo/workflows/docker-master.yaml deleted file mode 100644 index f731b84..0000000 --- a/.forgejo/workflows/docker-master.yaml +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index dadf1db..0000000 --- a/.forgejo/workflows/docker-tag.yaml +++ /dev/null @@ -1,23 +0,0 @@ -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/.woodpecker.yml b/.woodpecker.yml index f921bb6..843969c 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,14 +1,10 @@ steps: - env-info: - image: ubuntu:latest - commands: - - printenv docker-master: image: woodpeckerci/plugin-docker-buildx settings: repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner - tags: latest,${CI_COMMIT_SHA} + tags: latest,${CI_COMMIT} registry: git.van-hemmen.com username: from_secret: docker_username @@ -17,14 +13,13 @@ steps: when: event: - push - - manual branch: 'master' docker-tag: image: woodpeckerci/plugin-docker-buildx settings: repo: git.van-hemmen.com/guillaumehemmen/sonar-scanner - tags: latest,${CI_COMMIT_TAG} + tags: latest,${CI_TAG} registry: git.van-hemmen.com username: from_secret: docker_username diff --git a/Dockerfile b/Dockerfile index c3ba1ec..417183e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -FROM node:22 +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-7.1.0.4889-linux-x64.zip && \ - unzip sonar-scanner-cli-7.1.0.4889-linux-x64.zip && \ - 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 + 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