diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 7bca00785eabb5860abb0e988f6baa6907cd15d0..61cb7b7d21b18354589b023a0ccb8055501b1d8f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -7,7 +7,15 @@ name: Docker Image CI
# branches: [ develop ]
# on every push
-on: [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:
@@ -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
+
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e43429de23d6c0aee52a82aeb8d892eb8a7c56cc
--- /dev/null
+++ b/build.sh
@@ -0,0 +1 @@
+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 BRANCH=$(git rev-parse --abbrev-ref HEAD) docker-compose build jakartaEE
diff --git a/docker-compose.yml b/docker-compose.yml
index 67842851618b240b2ba565ae87fcdac951e80895..b349eac78040de64fbee60350486adaef2d46777 100644
--- a/docker-compose.yml
+++ b/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:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 880e779a4179d3d550c64deb2a71e1bd4068758a..5fd88e3b7774afc9e38ce86daa59057d4da2ca6c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,9 @@
### 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
diff --git a/mvn.sh b/mvn.sh
deleted file mode 100755
index 5d5927ed39eb9bad56fff346d19ef9c5981e11d2..0000000000000000000000000000000000000000
--- a/mvn.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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
diff --git a/pom.xml b/pom.xml
index 6c8b48b87861e7e4a76bd26ecb6061c2c5175990..04296a936e6a12a05d5565dfd84604a0201eca48 100644
--- a/pom.xml
+++ b/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>