Sonar Scanner folder removed and added in dockerfile #4

.github/dependabot.yml

@@ -5,16 +5,16 @@ updates:
     schedule:
       # Check for maven dependency updates every weekday at 08:00 UTC
       interval: "daily"
-      time: "08:00"
+        time: "08:00"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       # Check for updates to GitHub Actions every weekday at 08:00 UTC
       interval: "daily"
-      time: "08:00"
+        time: "08:00"
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
       # Check for updates to container images every weekday at 08:00 UTC
       interval: "daily"
-      time: "08:00"
+        time: "08:00"

.github/workflows/maven.yml

@@ -1,34 +1,24 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: CI
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  publish:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-    - name: Publish Docker Image
-      run: |
-          # login to GitHub Container Registry
-          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin
-          # build image
-          docker build . --tag ghcr.io/eclipse-opensmartclide/smartclide/tdprincipal:$(date +'%Y-%m-%d')-1
-          # push image
-          docker push ghcr.io/eclipse-opensmartclide/smartclide/tdprincipal:$(date +'%Y-%m-%d')-1
-
+name: Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

.github/workflows/publish.yml

@@ -0,0 +1,34 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  publish-image:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: Publish Docker Image
+      run: |
+          # login to GitHub Container Registry
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin
+          # build image
+          docker build . --tag ghcr.io/eclipse-opensmartclide/smartclide/tdprincipal:$(date +'%Y-%m-%d')-1
+          # push image
+          docker push ghcr.io/eclipse-opensmartclide/smartclide/tdprincipal:$(date +'%Y-%m-%d')-1
+

Dockerfile

@@ -1,6 +1,8 @@
 FROM  adoptopenjdk:16-jre-hotspot
-RUN apt-get update && apt-get install -y git
-ADD sonar-scanner-4.6.2.2472-linux sonar-scanner-4.6.2.2472-linux
+RUN apt-get update && apt-get install -y git && apt-get install -y unzip
+RUN curl -L -o /sonar-scanner-cli-4.6.2.2472-linux.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472-linux.zip && \
+    unzip -o -q /sonar-scanner-cli-4.6.2.2472-linux.zip -d . && \
+    rm -rf /sonar-scanner-cli-4.6.2.2472-linux.zip
 RUN chmod a+x /sonar-scanner-4.6.2.2472-linux/bin/sonar-scanner
 RUN chmod 755 /sonar-scanner-4.6.2.2472-linux/jre/bin/java
 ADD target/*.jar app.jar