update dockerfile

.github/workflows/develop.yml

@@ -5,7 +5,7 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ develop1 ]
+    branches: [ develop ]
 
 jobs:
   build:
@@ -14,11 +14,25 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml -Pnative
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Build and push
+      uses: docker/build-push-action@v4
+      with:
+        context: ./
+        file: ./src/main/docker/Dockerfile.native
+        push: true
+        tags: barais/grade-scope-istic:develop

.github/workflows/maven.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven

src/main/docker/Dockerfile.build.amd64

@@ -1,18 +1,21 @@
-FROM ghcr.io/graalvm/graalvm-ce:ol9-java11 AS build-step
+FROM quay.io/quarkus/ubi-quarkus-graalvmce-builder-image:jdk-21 AS build-step
+USER root
 WORKDIR /app
-RUN gu install native-image
+# RUN gu install native-image
 RUN microdnf install git -y
 RUN git clone https://github.com/correctexam/corrigeExamBack
 WORKDIR /app/corrigeExamBack
+RUN git checkout develop
+WORKDIR /app/corrigeExamBack
 
 RUN mkdir -p /opt/maven
 WORKDIR /opt/maven
-RUN curl -O "https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz" && tar xzvf "apache-maven-3.6.3-bin.tar.gz" && rm "apache-maven-3.6.3-bin.tar.gz"
+RUN curl -O "https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz" && tar xzvf "apache-maven-3.9.6-bin.tar.gz" && rm "apache-maven-3.9.6-bin.tar.gz"
 
 WORKDIR /app/corrigeExamBack
-RUN /opt/maven/apache-maven-3.6.3/bin/mvn package -Pnative
+RUN /opt/maven/apache-maven-3.9.6/bin/mvn package -Pnative
 
-FROM oraclelinux:9-slim as prod
+FROM quay.io/quarkus/quarkus-micro-image:2.0-amd64 as prod
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

src/main/docker/Dockerfile.native

@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/grade-scope-istic
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM quay.io/quarkus/quarkus-micro-image:2.0-amd64
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

src/main/java/fr/istic/service/ExamService.java

@@ -220,6 +220,7 @@ public Optional<ExamDTO> findOne(Long id) {
      */
     @Transactional
     public Paged<ExamDTO> findAll(Page page) {
+
         log.debug("Request to get all Exams");
         return new Paged<>(Exam.findAll().page(page))
                 .map(exam -> examMapper.toDto((Exam) exam));