diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25306d1..31ae848 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,9 @@ stages: build-images: stage: build - image: repo.nstart.local/nstart/docker-cli-buildx:1.0.0 + image: repo.nstart.cloud/nstart/docker-cli-buildx:1.0.0 services: - - name: repo.nstart.local/nstart/docker-dind-ca:1.0.0 + - name: repo.nstart.cloud/library/docker:29.1.2-dind alias: docker command: ["--tls=false"] variables: diff --git a/Dockerfile.alpine b/Dockerfile.alpine index d5d4f7a..fb33958 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,6 @@ -ARG BASE_REPO="repo.nstart.local/library/" +ARG BASE_REPO="repo.nstart.cloud/library/" ARG BASE_TAG="3.23.2" FROM ${BASE_REPO}alpine:${BASE_TAG} -COPY ca/nstart.local.crt /etc/apk/ca.pem COPY alpine/repositories /etc/apk/ diff --git a/Dockerfile.jdk-rhel b/Dockerfile.jdk-rhel index 95809d8..6803da9 100644 --- a/Dockerfile.jdk-rhel +++ b/Dockerfile.jdk-rhel @@ -1,13 +1,10 @@ -ARG BASE_REPO="repo.nstart.local/library/" +ARG BASE_REPO="repo.nstart.cloud/library/" ARG BASE_TAG="jdk25-ubi10" FROM ${BASE_REPO}gradle:${BASE_TAG} COPY rhel/ubi.repo /etc/yum.repos.d/ -COPY ca/nstart.local.crt /certificates/ -ENV USE_SYSTEM_CA_CERTS=1 - COPY java/maven.xml /etc/maven/settings.xml ENV GRADLE_USER_HOME=/etc/gradle diff --git a/Dockerfile.jdk-ubuntu b/Dockerfile.jdk-ubuntu index 949646f..98c9584 100644 --- a/Dockerfile.jdk-ubuntu +++ b/Dockerfile.jdk-ubuntu @@ -1,16 +1,10 @@ -ARG BASE_REPO="repo.nstart.local/library/" +ARG BASE_REPO="repo.nstart.cloud/library/" ARG BASE_TAG="jdk17-noble" FROM ${BASE_REPO}gradle:${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 -COPY ca/nstart.local.crt /certificates/ -ENV USE_SYSTEM_CA_CERTS=1 - ENV GRADLE_USER_HOME=/etc/gradle COPY java/00-nstart-repos.gradle /etc/gradle/init.d/00-nstart-repos.gradle @@ -18,8 +12,7 @@ RUN < nstart * - https://repo.nstart.local/repository/maven-proxy/ + https://repo.nstart.cloud/repository/maven-proxy/ diff --git a/node/npmrc b/node/npmrc index 8548b4e..0b42949 100644 --- a/node/npmrc +++ b/node/npmrc @@ -1,4 +1,3 @@ -registry=https://repo.nstart.local/repository/npm-group/ +registry=https://repo.nstart.cloud/repository/npm-group/ strict-ssl=true -cafile=/usr/local/share/ca-certificates/nstart.local.crt min-release-age=7 diff --git a/python/pip.conf b/python/pip.conf index a084bc6..a5bca2e 100644 --- a/python/pip.conf +++ b/python/pip.conf @@ -1,4 +1,3 @@ [global] -index-url = https://repo.nstart.local/repository/pypi-group/simple -cert = /usr/local/share/ca-certificates/nstart.local.crt +index-url = https://repo.nstart.cloud/repository/pypi-group/simple disable-pip-version-check = true diff --git a/rhel/ubi.repo b/rhel/ubi.repo index d3d8398..a7b6bed 100644 --- a/rhel/ubi.repo +++ b/rhel/ubi.repo @@ -1,71 +1,62 @@ [ubi-10-baseos-rpms] name = Red Hat Universal Base Image 10 (RPMs) - BaseOS -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/os +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-baseos-debug-rpms] name = Red Hat Universal Base Image 10 (Debug RPMs) - BaseOS -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/debug +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-baseos-source-rpms] name = Red Hat Universal Base Image 10 (Source RPMs) - BaseOS -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/source/SRPMS +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/baseos/source/SRPMS enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-appstream-rpms] name = Red Hat Universal Base Image 10 (RPMs) - AppStream -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/os +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-appstream-debug-rpms] name = Red Hat Universal Base Image 10 (Debug RPMs) - AppStream -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/debug +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-appstream-source-rpms] name = Red Hat Universal Base Image 10 (Source RPMs) - AppStream -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/source/SRPMS +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/appstream/source/SRPMS enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-codeready-builder-rpms] name = Red Hat Universal Base Image 10 (RPMs) - CodeReady Builder -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/os +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-codeready-builder-debug-rpms] name = Red Hat Universal Base Image 10 (Debug RPMs) - CodeReady Builder -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/debug +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt [ubi-10-codeready-builder-source-rpms] name = Red Hat Universal Base Image 10 (Source RPMs) - CodeReady Builder -baseurl = https://repo.nstart.local/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/source/SRPMS +baseurl = https://repo.nstart.cloud/repository/ubi-redhat//content/public/ubi/dist/ubi10/10/$basearch/codeready-builder/source/SRPMS enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -sslcacert=/certificates/nstart.local.crt