mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Automatically detect debian version
This commit is contained in:
parent
1f350b34f9
commit
1ef6c55491
4 changed files with 8 additions and 9 deletions
|
|
@ -5,7 +5,7 @@ set -xeuo pipefail
|
|||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
DOCKER_VERSION=${1}
|
||||
DEBIAN_VERSION=${2:-buster}
|
||||
DEBIAN_VERSION=$(lsb_release -c -s)
|
||||
|
||||
apt-get update
|
||||
apt-get -y install \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ function install_debian_stretch_deps() {
|
|||
logrotate python-docutils pkg-config cmake nodejs \
|
||||
libkrb5-dev postgresql-client mysql-client unzip \
|
||||
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
|
||||
libre2-dev libevent-dev gettext rsync git-core
|
||||
libre2-dev libevent-dev gettext rsync git-core lsb-release
|
||||
}
|
||||
|
||||
function install_debian_buster_deps() {
|
||||
|
|
@ -32,7 +32,7 @@ function install_debian_buster_deps() {
|
|||
logrotate python-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
|
||||
libre2-dev libevent-dev gettext rsync git-core lsb-release
|
||||
}
|
||||
|
||||
function install_debian_bullseye_deps() {
|
||||
|
|
@ -44,7 +44,7 @@ function install_debian_bullseye_deps() {
|
|||
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
|
||||
libre2-dev libevent-dev gettext rsync git-core lsb-release
|
||||
}
|
||||
|
||||
VERSION=`cat /etc/issue | cut -d ' ' -f 3`
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ set -xeuo pipefail
|
|||
IFS=$'\n\t'
|
||||
|
||||
POSTGRES_VERSION=${1:-12}
|
||||
DEBIAN_VERSION=${2:-buster}
|
||||
DEBIAN_VERSION=$(lsb_release -c -s)
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# Uninstall the system client so that we don't have multiple versions
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue