check if docker 25.0.1 breaks bootBuildImage

.gitlab-ci.yml

@@ -1,21 +1,47 @@
 include:
   - project: 'gitlab/gitlab'
-    ref: 'main'
+    ref: 'gradle-cache'
     file: 'ci-templates/gradle_java.yml'
 
 deploy:
   stage: deploy
   tags:
     - dind
+  # variables:
+    # TEST_BUILDVERSION: testing-build-cache-${CI_PIPELINE_ID}
   script:
-    - echo "Building with gradle version ${BUILDVERSION}"
-    - gradle -Pversion=${BUILDVERSION} publish
-    - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
-    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+    - apk add docker
+    - docker info
+    - docker login nexus.knecon.com:5001 -u ${CI_NEXUS_USER} -p ${CI_NEXUS_PASSWORD} 
+    - docker pull nexus.knecon.com:5001/ff/ocr-service-server:latest
+    - echo $DOCKER_HOST
+    - ls -al .gradleBuildCache/
+    - mv .gradleBuildCache/ /tmp/.gradleBuildCache/ || true
+    - ls -al
+    - gradle assemble
+    - echo "Building with gradle version testing-build-cache-${CI_PIPELINE_ID}"
+    - gradle -Pversion=testing-build-cache-${CI_PIPELINE_ID} publish
+    - gradle bootBuildImage --publishImage --configuration-cache -PbuildbootDockerHostNetwork=true -Pversion=testing-build-cache-${CI_PIPELINE_ID}
+    - gradle bootBuildImage --publishImage --configuration-cache -PbuildbootDockerHostNetwork=true -Pversion=testing-build-cache-${CI_PIPELINE_ID}
+  after_script:
+    - mkdir -p .gradleBuildCache
+    - ls -al `pwd`/.gradle
+    - du -sh `pwd`/.gradle/* | sort -h
+    - mv /tmp/.gradleBuildCache/ .gradleBuildCache/ || true
+    # - rm .gradle/caches/modules-2/gc.properties .gradle/caches/modules-2/modules-2.lock
+    - docker volume ls
+    - docker ps
+    - docker image ls
   artifacts:
     reports:
       dotenv: version.env
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH =~ /^release/
-    - if: $CI_COMMIT_TAG
+  cache:
+    untracked: true
+    key: gradle-build-cache
+    paths:
+      - .gradleBuildCache/
+      - .gradle/
+      # - ocr-service-v1/ocr-service-server/build/
+      # - ocr-service-v1/ocr-service-api/build/
+      # - ocr-service-v1/ocr-service-processor/build/
+      # - buildSrc/

ocr-service-v1/ocr-service-server/build.gradle.kts

@@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 plugins {
     application
     id("com.iqser.red.service.java-conventions")
-    id("org.springframework.boot") version "3.1.5"
+    id("org.springframework.boot") version "3.2.1"
     id("io.spring.dependency-management") version "1.1.3"
     id("org.sonarqube") version "4.3.0.3225"
     id("io.freefair.lombok") version "8.2.2"
@@ -17,7 +17,7 @@ configurations {
     }
 }
 
-val springBootStarterVersion = "3.1.5"
+val springBootStarterVersion = "3.2.1"
 
 dependencies {
     implementation(project(":ocr-service-processor"))
@@ -53,7 +53,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
 
     buildpacks.set(
         listOf(
-            "ghcr.io/fagiani/buildpacks/fagiani_apt@sha256:6471c8c70f32b749e29f65ae562ac0339fecad26aa9217628c00a6c31f197dae",
+            "ghcr.io/knsita/buildpacks/fagiani_apt@sha256:9771d4d27d8050aee62769490b8882fffc794745c129fb98e1f33196e2c93504",
             "ghcr.io/kschuettler/knecon-vcpkg@sha256:ba5e967b124de4865ff7e8f565684f752dd6e97b302e2dcf651283f6a19b98b9",
             "ghcr.io/kschuettler/knecon-tessdata@sha256:9062f728aa0340ac963bcdd6f5e740d683823a81d3f480db894da15bff72691a",
             "urn:cnb:builder:paketo-buildpacks/java"
@@ -79,4 +79,16 @@ tasks.named<BootBuildImage>("bootBuildImage") {
         val dockerTag = "nexus.knecon.com:5001/ff/${project.name}:${project.version}"
         tags.set(listOf(dockerTag))
     }
+
+    buildCache {
+        bind {
+            source.set("/tmp/.gradleBuildCache/cache-${project.name}.build")
+        }
+    }
+
+    launchCache {
+        bind {
+            source.set("/tmp/.gradleBuildCache/cache-${project.name}.launch")
+        }
+    }
 }

publish-custom-image.sh

@@ -11,5 +11,5 @@ commit_hash=$(git rev-parse --short=5 HEAD)
 # Combine branch and commit hash
 buildName="${USER}-${branch}-${commit_hash}"
 
-gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName --no-build-cache
+gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
 echo "nexus.knecon.com:5001/ff/${dir}-server:$buildName"