Merge branch 'sonar-ubuntu-add' into 'main'

Added Ubuntu:24.04 and SonarScannerCli:12.1

See merge request nstart/docker/baseimages!1

.gitlab-ci.yml

@@ -24,6 +24,7 @@ build-images:
           - eclipse-temurin-rhel-17-jre-ubi10-minimal
           - alpine-3-23-2
           - gradle-ubuntu-jdk17-noble
+          - ubuntu-24-04
 
   script:
     - echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY

Dockerfile.ubuntu

@@ -0,0 +1,9 @@
+ARG BASE_REPO="repo.nstart.local/library/"
+ARG BASE_TAG="24.04"
+
+FROM ${BASE_REPO}ubuntu:${BASE_TAG}
+
+COPY --chmod=007 ca/nstart.local.crt /usr/local/share/ca-certificates/nstart.local.crt
+
+COPY apt/99ca /etc/apt/apt.conf.d/99ca
+COPY apt/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources

README.md

@@ -10,6 +10,8 @@
 - Java 17, 25 JRE Eclipse Temurin (RHEL)
 - Java 17, 25 JDK Eclipse Temurin Gradle (RHEL)
 - Java 17  JDK Eclipse Temurin Gradle (Ubuntu)
+- Ubuntu 24.04
+- Alpine 3.23.2
 
 ## Сборка
 

docker-bake.hcl

@@ -41,7 +41,8 @@ target "image" {
       { image = "gradle", distro= "ubuntu", version = "jdk17-noble", dockerfile="Dockerfile.jdk-ubuntu" },
       { image = "eclipse-temurin", distro= "rhel", version = "17-jre-ubi10-minimal", dockerfile="Dockerfile.jre-rhel" },
       { image = "gradle", distro= "rhel", version = "jdk17-ubi10", dockerfile="Dockerfile.jdk-rhel" },
-      { image = "alpine", distro= "", version = "3.23.2", dockerfile="Dockerfile.alpine" }
+      { image = "alpine", distro= "", version = "3.23.2", dockerfile="Dockerfile.alpine" },
+      { image = "ubuntu", distro= "", version = "24.04", dockerfile="Dockerfile.ubuntu" }
     ]
   }