UNCLASSIFIED

Commit 98ed7563 authored by Gerard Fulton's avatar Gerard Fulton
Browse files

Merge branch 'gitlab-update-gpg' into 'master'

Update to GitLab 12.8.1 and use new rotated GitLab Public signing key

See merge request !8
parents 3b35fca3 d52f0df7
ARG GITLAB_VERSION=v12.8.0-ubi8 ARG GITLAB_VERSION=v12.8.1-ubi8
ARG BASE_REGISTRY=registry.access.redhat.com ARG BASE_REGISTRY=registry.access.redhat.com
ARG BASE_IMAGE=ubi8/ubi ARG BASE_IMAGE=ubi8/ubi
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
set -e set -e
### Environment Variables ### ### Environment Variables ###
GITLAB_VERSION=v12.8.0-ubi8 GITLAB_VERSION=v12.8.1-ubi8
VENDOR=gitlab VENDOR=gitlab
...@@ -32,7 +32,7 @@ for server in $(shuf -e ha.pool.sks-keyservers.net \ ...@@ -32,7 +32,7 @@ for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://keyserver.ubuntu.com:80 \ hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu) ; pgp.mit.edu) ;
do do
gpg --batch --keyserver "$server" --recv-keys 8040EEFCCED8C668EF27F7C61DC5606C0C7E9A9B && break || : ; \ gpg --batch --keyserver "$server" --recv-keys 5c7738cc4840f93f6e9170ff5a0e20d5f9706778 && break || : ; \
done done
gpg --verify ${DOWNLOAD_DIR}/ubi8-build-dependencies-${GITLAB_VERSION}.tar.asc ${DOWNLOAD_DIR}/ubi8-build-dependencies-${GITLAB_VERSION}.tar gpg --verify ${DOWNLOAD_DIR}/ubi8-build-dependencies-${GITLAB_VERSION}.tar.asc ${DOWNLOAD_DIR}/ubi8-build-dependencies-${GITLAB_VERSION}.tar
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment