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

Add Debian Bookworm images

Browse source
This commit is contained in:
Clemens Beck 2024-01-18 10:20:04 +00:00 • committed by Balasankar 'Balu' C
parent 5cc9de6b26
commit db6f2daec2
10 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install-chrome
View file

@ -75,7 +75,7 @@ function build_ubi() {
}
BUILD_OS=${BUILD_OS:-debian}
OS_VERSION=${OS_VERSION:-bullseye}
OS_VERSION=${OS_VERSION:-bookworm}
# When using a -slim version, actually use the non-slim OS version.
#

17
scripts/install-essentials
View file

@ -18,6 +18,18 @@ function install_debian_bullseye_deps() {
libre2-dev libevent-dev gettext rsync git-core lsb-release
}
function install_debian_bookworm_deps() {
apt-get install -y \
curl wget build-essential apt-utils clang locales openssh-client \
libclang-dev libssl-dev libyaml-dev libreadline-dev llvm-dev zlib1g-dev \
libncurses5-dev libffi-dev ca-certificates libxml2-dev \
libxslt1-dev libcurl4-openssl-dev libicu-dev \
logrotate python3-docutils pkg-config cmake \
libkrb5-dev postgresql-client unzip \
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
libre2-dev libevent-dev gettext rsync git-core lsb-release
}
function prepare_debian_environment() {
export DEBIAN_FRONTEND=noninteractive
@ -27,8 +39,9 @@ function prepare_debian_environment() {
case "$VERSION" in
11)
install_debian_bullseye_deps
;;
install_debian_bullseye_deps;;
12)
install_debian_bookworm_deps;;
esac
# Set UTF-8

19
scripts/install-ruby
View file

@ -16,6 +16,10 @@ JEMALLOC_DOWNLOAD_URL="https://github.com/jemalloc/jemalloc/releases/download/${
BUNDLER_VERSION=${3:-""}
RUBYGEMS_VERSION=${4:-""}
# only installed for Ruby 3.0 on debian bookworm
CUSTOM_OPENSSL_VERSION=1.1.1w
CUSTOM_OPENSSL_DIR=/usr/local/openssl_ruby
function build_common() {
# Download jemalloc
mkdir -p /usr/src/jemalloc
@ -90,6 +94,7 @@ function build_debian() {
apt-get update
apt-get install -y --no-install-recommends bison dpkg-dev libgdbm-dev autoconf
install_custom_openssl_if_needed
build_common
apt-get purge -y --auto-remove ruby
@ -115,6 +120,20 @@ function build_ubi() {
[ "$(command -v ruby)" = '/usr/local/bin/ruby' ]
}
function install_custom_openssl_if_needed() {
if [[ $RUBY_VERSION =~ "3.0" ]] && [[ $OS_VERSION =~ "bookworm" ]]; then
apt-get install -y --no-install-recommends perl make gcc
curl -fsSL "https://www.openssl.org/source/openssl-${CUSTOM_OPENSSL_VERSION}.tar.gz" | tar -xzC /tmp
cd /tmp/openssl-${CUSTOM_OPENSSL_VERSION}
./config --prefix="$CUSTOM_OPENSSL_DIR" --openssldir="$CUSTOM_OPENSSL_DIR" shared zlib
make
make install
rm -rf /tmp/openssl-${CUSTOM_OPENSSL_VERSION}
# set CONFIGURE_ARGS for ruby builds
export CONFIGURE_ARGS="${CONFIGURE_ARGS:-} --with-openssl-dir=$CUSTOM_OPENSSL_DIR"
fi
}
BUILD_OS=${BUILD_OS:-debian}
if [[ $BUILD_OS =~ debian ]]; then

6
scripts/lib/custom-docker-build
View file

@ -93,8 +93,8 @@ function print_chrome_args() {
CHROMIUM_VERSION=119.0.6045.159-1
;;
120|120.0)
CHROME_VERSION=120.0.6099.199-1
CHROMIUM_VERSION=120.0.6099.199-1
CHROME_VERSION=120.0.6099.216-1
CHROMIUM_VERSION=120.0.6099.216-1
;;
*) fail "Unknown chrome version $1" ;;
esac
@ -417,7 +417,7 @@ if [[ -n "$OS" ]]; then
elif [[ -n "$UBI" ]]; then
unset DEBIAN
else
DEBIAN=${DEBIAN:-bullseye}
DEBIAN=${DEBIAN:-bookworm}
fi
build_custom_if_needed $@