diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f2d19f..25306d1 100644 --- a/.gitlab-ci.yml +++ b/.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 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/README.md b/README.md index ddfedd1..5ca77bf 100644 --- a/README.md +++ b/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 ## Сборка diff --git a/docker-bake.hcl b/docker-bake.hcl index 260dc33..c763c62 100644 --- a/docker-bake.hcl +++ b/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" } ] }