mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 18:12:55 +01:00
Cache Google Chrome deb with generic packages rather than AWS
This commit is contained in:
parent
6bb7cc091f
commit
e951d1ab82
4 changed files with 37 additions and 30 deletions
|
|
@ -5,6 +5,9 @@ IFS=$'\n\t'
|
|||
|
||||
CHROME_VERSION=${1:-97.0.4692.99-1}
|
||||
CHROME_DRIVER_VERSION=${2:-97.0.4692.71}
|
||||
# We hard code the URL rather than using $CI_API_V4_URL $CI_PROJECT_ID,
|
||||
# because we would need to forward those variables
|
||||
CHROME_DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/google-chrome-stable"
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||
|
|
@ -12,14 +15,14 @@ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /et
|
|||
|
||||
apt-get update -q -y
|
||||
|
||||
# Download from our local S3 bucket if we can't find the package in the repository
|
||||
# Download from our package registry if we can't find the package in the apt repository
|
||||
echo "Searching for $CHROME_VERSION in apt repository"
|
||||
CHECK_VERSION=$(apt-cache show google-chrome-stable | grep Version | grep "$CHROME_VERSION") || true
|
||||
|
||||
if [[ -z $CHECK_VERSION ]]; then
|
||||
CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
|
||||
CHROME_URL="https://s3.amazonaws.com/gitlab-google-chrome-stable/${CHROME_DEB}"
|
||||
echo "Downloading $CHROME_URL"
|
||||
CHROME_URL="${CHROME_DOWNLOAD_URL_BASE}/${CHROME_VERSION}/${CHROME_DEB}"
|
||||
echo "Downloading from our Package registry: $CHROME_URL"
|
||||
curl --silent --show-error --fail -O $CHROME_URL
|
||||
dpkg -i ./$CHROME_DEB || true
|
||||
apt-get install -f -y
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue