From 8741cc1f262a18e8bdbb3b3a3ff3dd23c8ce7551 Mon Sep 17 00:00:00 2001
From: "Ivan I. Ovchinnikov" <ovchinnikov.ii@nstart.space>
Date: Wed, 22 Apr 2026 21:30:43 +0300
Subject: [PATCH] fix: removed sonar base image, will be implemented in other
 repo

---
 .gitlab-ci.yml               | 1 -
 Dockerfile.sonar-amazonlinux | 9 ---------
 README.md                    | 1 -
 amazonlinux/amazon.repo      | 8 --------
 docker-bake.hcl              | 3 +--
 5 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 Dockerfile.sonar-amazonlinux
 delete mode 100644 amazonlinux/amazon.repo

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89736f0..25306d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,6 @@ build-images:
           - alpine-3-23-2
           - gradle-ubuntu-jdk17-noble
           - ubuntu-24-04
-          - sonar-scanner-cli-amazonlinux-12-1
 
   script:
     - echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY
diff --git a/Dockerfile.sonar-amazonlinux b/Dockerfile.sonar-amazonlinux
deleted file mode 100644
index a4836ad..0000000
--- a/Dockerfile.sonar-amazonlinux
+++ /dev/null
@@ -1,9 +0,0 @@
-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/README.md b/README.md
index 2fe009f..5ca77bf 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@
 - Java 17  JDK Eclipse Temurin Gradle (Ubuntu)
 - Ubuntu 24.04
 - Alpine 3.23.2
-- Sonar-scanner-cli 12.1 (Amazon Linux)
 
 ## Сборка
 
diff --git a/amazonlinux/amazon.repo b/amazonlinux/amazon.repo
deleted file mode 100644
index 55e4223..0000000
--- a/amazonlinux/amazon.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-# $repoguid - guid из файла `/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 186d3cf..c763c62 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -42,8 +42,7 @@ target "image" {
       { 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 = "ubuntu", distro= "", version = "24.04", dockerfile="Dockerfile.ubuntu" },
-      { image = "sonar-scanner-cli", distro= "amazonlinux", version = "12.1", dockerfile="Dockerfile.sonar-amazonlinux" }
+      { image = "ubuntu", distro= "", version = "24.04", dockerfile="Dockerfile.ubuntu" }
     ]
   }