mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-10 02:22:57 +01:00
Build arm64 images by default and additionally do not require docker buildx for simple builds
This commit is contained in:
parent
66c6656f97
commit
f6a1f0e63f
12 changed files with 128 additions and 84 deletions
|
|
@ -10,7 +10,9 @@ function build_debian() {
|
|||
if [ "${ARCH}" == "amd64" ]; then
|
||||
PKG=google-chrome-stable
|
||||
else
|
||||
PKG=chromium
|
||||
# TODO: We do not yet have all packages required for platform other than amd64
|
||||
apt install -y chromium chromium-driver
|
||||
return
|
||||
fi
|
||||
|
||||
# We hard code the URL rather than using $CI_API_V4_URL $CI_PROJECT_ID,
|
||||
|
|
@ -21,8 +23,7 @@ function build_debian() {
|
|||
|
||||
echo "Installing browser"
|
||||
curl --silent --show-error --fail -O "$BROWSER_URL"
|
||||
dpkg -i "./${BROWSER_DEB}" || true
|
||||
apt-get install -f -y
|
||||
apt install -y "$PWD/$BROWSER_DEB"
|
||||
rm -f "$BROWSER_DEB"
|
||||
|
||||
echo "Installing webdriver"
|
||||
|
|
@ -38,8 +39,7 @@ function build_debian() {
|
|||
DRIVER_URL="${DOWNLOAD_URL_BASE}/${CHROME_VERSION}/${DRIVER_DEB}"
|
||||
|
||||
curl --silent --show-error --fail -O "$DRIVER_URL"
|
||||
dpkg -i "./${DRIVER_DEB}" || true
|
||||
apt-get install -f -y
|
||||
apt install -y "$PWD/$DRIVER_DEB"
|
||||
rm -f "$DRIVER_DEB"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue