From 1f350b34f91b01795cd87fd47fca3dbd2066cfc7 Mon Sep 17 00:00:00 2001 From: Andrejs Cunskis Date: Thu, 12 May 2022 13:23:30 +0300 Subject: [PATCH 1/4] Add slim docker image --- .gitlab/ci/docker.images.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab/ci/docker.images.yml b/.gitlab/ci/docker.images.yml index df944c8..60bae2a 100644 --- a/.gitlab/ci/docker.images.yml +++ b/.gitlab/ci/docker.images.yml @@ -6,3 +6,11 @@ docker: BUILDX: '0.8' extends: - .build_and_push + +docker-slim: + variables: + DEBIAN: bullseye-slim + DOCKER: '20.10.14' + BUILDX: '0.8' + extends: + - .build_and_push From 1ef6c55491e0a345b84bd18873861fc15b4c69b2 Mon Sep 17 00:00:00 2001 From: Andrejs Cunskis Date: Tue, 17 May 2022 14:29:04 +0300 Subject: [PATCH 2/4] Automatically detect debian version --- Dockerfile.custom | 6 ++---- scripts/install-docker | 2 +- scripts/install-essentials | 6 +++--- scripts/install-postgresql | 3 ++- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Dockerfile.custom b/Dockerfile.custom index 4cb3136..d8e7ff2 100644 --- a/Dockerfile.custom +++ b/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 diff --git a/scripts/install-docker b/scripts/install-docker index 8612878..2dedc30 100755 --- a/scripts/install-docker +++ b/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 \ diff --git a/scripts/install-essentials b/scripts/install-essentials index 601a7de..452387f 100755 --- a/scripts/install-essentials +++ b/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` diff --git a/scripts/install-postgresql b/scripts/install-postgresql index 9c75107..2a11cb6 100755 --- a/scripts/install-postgresql +++ b/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 From 7e2f897d6c0a2402393062d63e53d0201c17a77a Mon Sep 17 00:00:00 2001 From: Andrejs Cunskis Date: Tue, 17 May 2022 14:39:17 +0300 Subject: [PATCH 3/4] Extract common versions --- .gitlab/ci/docker.images.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitlab/ci/docker.images.yml b/.gitlab/ci/docker.images.yml index 60bae2a..c8fc67a 100644 --- a/.gitlab/ci/docker.images.yml +++ b/.gitlab/ci/docker.images.yml @@ -1,16 +1,19 @@ # Docker image with buildx plugin +.docker: + variables: + DOCKER: '20.10.14' + BUILDX: '0.8' + docker: + extends: + - .docker + - .build_and_push variables: DEBIAN: bullseye - DOCKER: '20.10.14' - BUILDX: '0.8' - extends: - - .build_and_push docker-slim: + extends: + - .docker + - .build_and_push variables: DEBIAN: bullseye-slim - DOCKER: '20.10.14' - BUILDX: '0.8' - extends: - - .build_and_push From c0e44db0245f59fe08ff1eb03b5490a8ed50c74e Mon Sep 17 00:00:00 2001 From: Andrejs Cunskis Date: Tue, 17 May 2022 14:58:39 +0300 Subject: [PATCH 4/4] Use slim debian base --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce9cb17..044a476 100644 --- a/.gitlab-ci.yml +++ b/.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: