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

Automatically detect debian version

Browse source
This commit is contained in:
Andrejs Cunskis 2022-05-17 14:29:04 +03:00
parent 1f350b34f9
commit 1ef6c55491
No known key found for this signature in database
GPG key ID: 87CB75083F227241
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile.custom
View file

@ -54,9 +54,8 @@ RUN if [ -n "$LFS_VERSION" ]; then /scripts/install-lfs && git lfs --version; fi
# Postgres
ARG POSTGRES_VERSION
ARG DEBIAN_VERSION
RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql $POSTGRES_VERSION $DEBIAN_VERSION; fi
RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql $POSTGRES_VERSION; fi
# GraphicsMagick
ARG GRAPHISMAGICK_VERSION
@ -67,9 +66,8 @@ RUN if [ -n "$GRAPHISMAGICK_VERSION" ]; then /scripts/install-graphicsmagick &&
# Docker
ARG DOCKER_VERSION
ARG DEBIAN_VERSION
RUN if [ -n "$DOCKER_VERSION" ]; then /scripts/install-docker $DOCKER_VERSION $DEBIAN_VERSION; fi
RUN if [ -n "$DOCKER_VERSION" ]; then /scripts/install-docker $DOCKER_VERSION; fi
# Docker buildx plugin
ARG BUILDX_VERSION

2
scripts/install-docker
View file

@ -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 \

6
scripts/install-essentials
View file

@ -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
scripts/install-postgresql
View file

@ -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