feat: add ubuntu 24.04 and sonar-scanner-cli baseimages for nstart local registry

.gitlab-ci.yml

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

Dockerfile.sonar-amazonlinux

@@ -0,0 +1,9 @@
+ARG BASE_REPO="repo.nstart.local/sonarsource/"
+ARG BASE_TAG="12.1"
+
+FROM ${BASE_REPO}sonar-scanner-cli:${BASE_TAG}
+
+COPY amazonlinux/amazon.repo /etc/yum.repos.d/
+
+COPY ca/nstart.local.crt /certificates/
+ENV USE_SYSTEM_CA_CERTS=1

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

amazonlinux/amazon.repo

@@ -0,0 +1,8 @@
+# $repoguid - uuid ближайшего cdn для загрузки пакетов (по базовому образу amazon linux 2023 `/etc/dnf/vars/repoguid`)
+[amazonlinux]
+name=Amazon Linux 2023 repository
+baseurl = https://repo.nstart.local/repository/amazon-linux/al2023/core/guids/$repoguid/$basearch/
+enabled = 1
+gpgcheck = 1
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023
+sslcacert = /certificates/nstart.local.crt

docker-bake.hcl

@@ -41,7 +41,9 @@ 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" },
+      { image = "sonar-scanner-cli", distro= "amazonlinux", version = "12.1", dockerfile="Dockerfile.sonar-amazonlinux" }
     ]
   }