From 9b6a8e341f775cbbd0299cca3a5fd25156d9db47 Mon Sep 17 00:00:00 2001 From: Alistair Burrowes Date: Sat, 26 Feb 2022 14:17:06 +1100 Subject: [PATCH 1/3] Remove unneeded packages from slim Slim is supposed to only be the bare minimum, where as the regular images are more batteries included. --- 8.10/buster-slim/Dockerfile | 2 -- 9.0/buster-slim/Dockerfile | 2 -- 9.2/buster-slim/Dockerfile | 2 -- 3 files changed, 6 deletions(-) diff --git a/8.10/buster-slim/Dockerfile b/8.10/buster-slim/Dockerfile index f62caf9..23db616 100644 --- a/8.10/buster-slim/Dockerfile +++ b/8.10/buster-slim/Dockerfile @@ -16,11 +16,9 @@ RUN apt-get update && \ libffi-dev \ libgmp-dev \ libnuma-dev \ - libsqlite3-dev \ libtinfo-dev \ make \ netbase \ - openssh-client \ xz-utils \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* diff --git a/9.0/buster-slim/Dockerfile b/9.0/buster-slim/Dockerfile index fbb7b6c..7c6fb7d 100644 --- a/9.0/buster-slim/Dockerfile +++ b/9.0/buster-slim/Dockerfile @@ -16,11 +16,9 @@ RUN apt-get update && \ libffi-dev \ libgmp-dev \ libnuma-dev \ - libsqlite3-dev \ libtinfo-dev \ make \ netbase \ - openssh-client \ xz-utils \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* diff --git a/9.2/buster-slim/Dockerfile b/9.2/buster-slim/Dockerfile index 4069bb9..70fb858 100644 --- a/9.2/buster-slim/Dockerfile +++ b/9.2/buster-slim/Dockerfile @@ -16,11 +16,9 @@ RUN apt-get update && \ libffi-dev \ libgmp-dev \ libnuma-dev \ - libsqlite3-dev \ libtinfo-dev \ make \ netbase \ - openssh-client \ xz-utils \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* From b5fb99261d16126cadf4aaf655dd593c178d688b Mon Sep 17 00:00:00 2001 From: Alistair Burrowes Date: Sat, 26 Feb 2022 14:26:26 +1100 Subject: [PATCH 2/3] Rename to slim-buster This is also a convention of other official images. --- .github/workflows/debian.yml | 4 ++-- 8.10/{buster-slim => slim-buster}/Dockerfile | 0 9.0/{buster-slim => slim-buster}/Dockerfile | 0 9.2/{buster-slim => slim-buster}/Dockerfile | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename 8.10/{buster-slim => slim-buster}/Dockerfile (100%) rename 9.0/{buster-slim => slim-buster}/Dockerfile (100%) rename 9.2/{buster-slim => slim-buster}/Dockerfile (100%) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 31ef6c4..8847305 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -6,7 +6,7 @@ on: - master paths: - '**/buster/Dockerfile' - - '**/buster-slim/Dockerfile' + - '**/slim-buster/Dockerfile' - '.github/workflows/debian.yml' jobs: @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: ghc: ['8.10.7', '9.0.2', '9.2.1'] - deb: ['buster', 'buster-slim'] + deb: ['buster', 'slim-buster'] include: - ghc: '8.10.7' ghc_minor: '8.10' diff --git a/8.10/buster-slim/Dockerfile b/8.10/slim-buster/Dockerfile similarity index 100% rename from 8.10/buster-slim/Dockerfile rename to 8.10/slim-buster/Dockerfile diff --git a/9.0/buster-slim/Dockerfile b/9.0/slim-buster/Dockerfile similarity index 100% rename from 9.0/buster-slim/Dockerfile rename to 9.0/slim-buster/Dockerfile diff --git a/9.2/buster-slim/Dockerfile b/9.2/slim-buster/Dockerfile similarity index 100% rename from 9.2/buster-slim/Dockerfile rename to 9.2/slim-buster/Dockerfile From e3757bee72c7edbe306cae2a4f8088edcd25c776 Mon Sep 17 00:00:00 2001 From: Alistair Burrowes Date: Sat, 26 Feb 2022 14:31:39 +1100 Subject: [PATCH 3/3] Avoid redundant builds --- .github/workflows/debian.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 8847305..46c444f 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -9,6 +9,11 @@ on: - '**/slim-buster/Dockerfile' - '.github/workflows/debian.yml' +# See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency. +concurrency: + group: ${{ github.head_ref }}-${{ github.workflow }} + cancel-in-progress: true + jobs: build-smoke-test: timeout-minutes: 30