diff --git a/Dockerfile b/Dockerfile index 24c0ca683d8e4ebdb907f46903d2638b47bd8431..dfc5e4088075fb86b5a6633e4887cd0e2c852797 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -ARG GITLAB_VERSION=v12.10.3-ubi8 +ARG GITLAB_VERSION=v12.10.5-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=12.10.3 +ARG BASE_TAG=12.10.5 -ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1 +ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.2 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${UBI_IMAGE} AS builder diff --git a/Jenkinsfile b/Jenkinsfile index 278c8d6ec28944c97c1b166a83e8ce3b76417a99..e07f68c707641d16b8bcd69b1b96e41109b0ded3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "12.10.3") +dccscrPipeline(version: "12.10.5") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 66deb7a0d22d6175cdba258fb429327436cae0fb..684ee850bdd3e036e43737ad682c1a55f700bac4 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-12.10.3} +TAG=${1:-12.10.5} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 28d0689ef7b9f47eede16f74005d16b6f7fbbe66..9206a9f9e98aab6824da4dbe017907b025983cc9 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.3-ubi8.tar" - filename: "ubi8-build-dependencies-v12.10.3-ubi8.tar" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.5-ubi8.tar" + filename: "ubi8-build-dependencies-v12.10.5-ubi8.tar" validation: type: "sha256" - value: "014daa3ea5084893124a48d6affca6b2d6cd5d50827f3027386824ae369f5767" + value: "6b6518cf5c3641b20757d9b9c7aeb176377366a2160f283fb744d22758cd4a88"