moves to docker-compose.

.github/workflows/docker-image.yml

@@ -9,6 +9,14 @@ name: Docker Image CI
 # on every push
 on: [push]
 
+env:
+  GITHUBLOGIN: ${{secrets.GITHUBLOGIN}}
+  GITHUBPASSWORD: ${{secrets.GITHUBPASSWORD}}
+  DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+  DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+  SONAR_URL: ${{secrets.SONAR_URL}}
+  SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
+
 jobs:
 
   maven-build:
@@ -17,5 +25,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Get Tag from Maven version
+      run: echo "TAG=$(docker run -v maven-repo:/root/.m2 -w /usr/src/mymaven -v ${PWD}:/usr/src/mymaven --rm maven:3.8.4-eclipse-temurin-11 mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec|sed s/-SNAPSHOT/.${GITHUB_RUN_NUMBER}/)" >> $GITHUB_ENV
+    - name: test
+      run: echo $TAG
     - name: Build the Docker image for branch ${GITHUB_REF_NAME}
-      run: DOCKER_BUILDKIT=1 docker build . --build-arg GITHUBLOGIN --build-arg GITHUBPASSWORD --build-arg SONAR_URL --build-arg SONAR_TOKEN --file ./docker/Dockerfile --tag brunoe/samplejee91:${GITHUB_REF_NAME}
+      # run: DOCKER_BUILDKIT=1 docker build . --build-arg GITHUBLOGIN --build-arg GITHUBPASSWORD --build-arg SONAR_URL --build-arg SONAR_TOKEN --file ./docker/Dockerfile --tag brunoe/samplejee91:${GITHUB_REF_NAME}
+      run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 BRANCH=${GITHUB_REF_NAME} TAG=${TAG} docker-compose build jakartaEE
+    - name: Login to DockerHub Registry
+      run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+

build.sh

+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 BRANCH=$(git rev-parse --abbrev-ref HEAD) docker-compose build jakartaEE

docker-compose.yml

@@ -3,13 +3,15 @@ services:
   jakartaEE:
     build:
       args:
+        - BRANCH
+        - TAG
         - GITHUBLOGIN
         - GITHUBPASSWORD
         - SONAR_URL
         - SONAR_TOKEN
       context: .
       dockerfile: docker/Dockerfile
-    image: brunoe/samplejee91
+    image: brunoe/samplejee91:${TAG:-latest}
     environment:
       - ADMIN_PASSWORD=admin
     ports:

docker/Dockerfile

 ### First we build the application in docker in a controlled env
 FROM maven:3.8.4-eclipse-temurin-11 as build
+ARG BRANCH
 ARG GITHUBLOGIN
 ARG GITHUBPASSWORD
-ARG SONAR_HOST
+ARG SONAR_URL
 ARG SONAR_TOKEN
 
 WORKDIR /app
@@ -19,11 +20,11 @@ COPY docker/settings-docker.xml /usr/share/maven/ref/
 COPY . /app/
 
 RUN --mount=type=cache,id=mvncache,target=/root/.m2/repository,rw \
-	mvn $MAVEN_CLI_OPTS -Dmaven.test.skip=true verify
+	mvn $MAVEN_CLI_OPTS verify
 
 RUN --mount=type=cache,id=mvncache,target=/root/.m2/repository,rw \
     if [ "$SONAR_TOKEN" ] ; then \
-      mvn $MAVEN_CLI_OPTS -D sonar.branch.name=${GITHUB_REF#refs/heads/} \
+      mvn $MAVEN_CLI_OPTS -D sonar.branch.name=${BRANCH} \
         --activate-profiles sonar sonar:sonar && \
       mvn $MAVEN_CLI_OPTS --activate-profiles sonar -pl . sonar-quality-gate:check ; \
     fi

mvn.sh

-#!/bin/bash
-docker run \
-          --env GITHUBLOGIN="$GITHUBLOGIN" \
-          --env GITHUBPASSWORD="$GITHUBPASSWORD" \
-          --env SONAR_TOKEN="$SONAR_TOKEN" \
-          --volume ~/.m2:/var/maven/.m2 \
-          --volume ~/.sonar:/var/maven/.sonar \
-          --volume ~/.config:/var/maven/.config \
-          --volume ~/.ssh:/home/user/.ssh \
-          --volume ~/.gitconfig:/home/user/.gitconfig \
-          --volume "$(pwd)":/usr/src/mymaven \
-          --workdir /usr/src/mymaven \
-          --rm \
-          --env PUID="$(id -u)" -e PGID="$(id -g)" \
-          --env MAVEN_CONFIG=/var/maven/.m2 \
-          brunoe/maven:3.8.1-jdk-16 \
-          runuser --user user --group user -- mvn -B -e -T 1C -Duser.home=/var/maven --settings /usr/src/mymaven/.github/ci-settings.xml "$@"
\ No newline at end of file

pom.xml

@@ -7,6 +7,8 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <name>Demo JakartaEE</name>
+
     <modules>
         <module>entites</module>
         <module>utils</module>
@@ -276,6 +278,20 @@
                     <artifactId>maven-site-plugin</artifactId>
                     <version>3.9.1</version>
                 </plugin>
+
+                <!--Sonarquve -->
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.9.1.2184</version>
+                </plugin>
+                <plugin>
+                    <groupId>io.github.r0bb3n</groupId>
+                    <artifactId>sonar-quality-gate-maven-plugin</artifactId>
+                    <version>1.1.0</version>
+                </plugin>
+
+
             </plugins>
         </pluginManagement>
     </build>
@@ -299,25 +315,5 @@
         </repository>
     </repositories>
 
-    <profiles>
-        <profile>
-            <id>sonar</id>
-            <build>
-                <plugins>
-                    <!--Sonarquve -->
-                    <plugin>
-                        <groupId>org.sonarsource.scanner.maven</groupId>
-                        <artifactId>sonar-maven-plugin</artifactId>
-                        <version>3.9.1.2184</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.github.r0bb3n</groupId>
-                        <artifactId>sonar-quality-gate-maven-plugin</artifactId>
-                        <version>1.1.0</version>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 </project>