NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-10 02:22:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'multiarch-images' into 'master'"

Browse source 
This reverts merge request !577
This commit is contained in:
Balasankar 'Balu' C 2022-09-19 10:15:53 +00:00
parent 7fc85c87db
commit 514f304d5f
16 changed files with 66 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/install-chrome
View file

@ -4,9 +4,7 @@ set -xeuo pipefail
IFS=$'\n\t'
function build_debian() {
ARCH="${TARGETARCH:-amd64}"
if [[ "${ARCH}" == "arm64" ]]; then
if [[ $(dpkg --print-architecture) == arm64 ]]; then
echo "The arm64 does not have prebuilt chrome. Using chromium instead."
apt-get update -q -y
apt-get install -y chromium chromium-driver
@ -34,7 +32,7 @@ function build_debian() {
apt-cache policy google-chrome-stable
if [[ -z $CHECK_VERSION ]]; then
CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_${ARCH}.deb"
CHROME_DEB="google-chrome-stable_${CHROME_VERSION}_$(dpkg --print-architecture).deb"
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