From f282d21956ea5066bd68df0eea6b1446db6b5031 Mon Sep 17 00:00:00 2001
From: "Ivan I. Ovchinnikov" <ovchinnikov.ii@nstart.space>
Date: Mon, 20 Apr 2026 21:26:36 +0300
Subject: [PATCH] feat: add ubuntu 24.04 and sonar-scanner-cli baseimages for
 nstart local registry

---
 .gitlab-ci.yml               | 2 ++
 Dockerfile.sonar-amazonlinux | 9 +++++++++
 Dockerfile.ubuntu            | 9 +++++++++
 amazonlinux/amazon.repo      | 8 ++++++++
 docker-bake.hcl              | 4 +++-
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile.sonar-amazonlinux
 create mode 100644 Dockerfile.ubuntu
 create mode 100644 amazonlinux/amazon.repo

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f2d19f..da4ac86 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/Dockerfile.sonar-amazonlinux b/Dockerfile.sonar-amazonlinux
new file mode 100644
index 0000000..a4836ad
--- /dev/null
+++ b/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
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
new file mode 100644
index 0000000..63d1fc2
--- /dev/null
+++ b/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
diff --git a/amazonlinux/amazon.repo b/amazonlinux/amazon.repo
new file mode 100644
index 0000000..3be5e76
--- /dev/null
+++ b/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
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 260dc33..186d3cf 100644
--- a/docker-bake.hcl
+++ b/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" }
     ]
   }