Merge branch 'slim-docker-builder' into 'master'

Add slim docker image

See merge request gitlab-org/gitlab-build-images!538

.gitlab-ci.yml

@@ -4,7 +4,7 @@ include:
   - local: '.gitlab/ci/*.yml'
 
 default:
-  image: ${CI_REGISTRY_IMAGE}/debian-bullseye:docker-20.10.14-buildx-0.8
+  image: ${CI_REGISTRY_IMAGE}/debian-bullseye-slim:docker-20.10.14-buildx-0.8
   services:
     - docker:20.10.14-dind
   before_script:

.gitlab/ci/docker.images.yml

@@ -1,8 +1,19 @@
 # Docker image with buildx plugin
-docker:
+.docker:
   variables:
-    DEBIAN: bullseye
     DOCKER: '20.10.14'
     BUILDX: '0.8'
+
+docker:
   extends:
+    - .docker
     - .build_and_push
+  variables:
+    DEBIAN: bullseye
+
+docker-slim:
+  extends:
+    - .docker
+    - .build_and_push
+  variables:
+    DEBIAN: bullseye-slim

Dockerfile.custom

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

scripts/install-docker

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

scripts/install-essentials

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

scripts/install-postgresql

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