From 3e88dcb7f790abaac90c342ea918a5814b28df78 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 22:33:47 +0200 Subject: [PATCH 1/9] workflows/docker: add 22.04 --- .github/workflows/docker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 70ded17aa5..61c33397f4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,13 +17,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ["16.04", "18.04", "20.04"] + version: ["16.04", "18.04", "20.04", "22.04"] steps: - name: Checkout uses: actions/checkout@main with: fetch-depth: 0 persist-credentials: false + - name: Fetch origin/master from Git run: git fetch origin master From 9fab6ae7d9e2b691ac6a886b330c041e5f6abe40 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 22:39:03 +0200 Subject: [PATCH 2/9] Dockerfile: install gnupg --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9c14792f9c..ab3b043dff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN apt-get update \ g++ \ gawk \ git \ + gnupg \ less \ libz-dev \ locales \ From 7ffaaf8c9a9170e19d00bef9b78dda7ea42a02ea Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 22:43:09 +0200 Subject: [PATCH 3/9] Dockerfile: install gpg agent --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ab3b043dff..ae9f19917f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update \ gawk \ git \ gnupg \ + gnupg-agent \ less \ libz-dev \ locales \ From 7972c332e880ca7d4d2e2de865c664b2d956179a Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 22:46:31 +0200 Subject: [PATCH 4/9] Dockerfile: install gpg --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae9f19917f..2d45516f9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ RUN apt-get update \ g++ \ gawk \ git \ + gpg \ gnupg \ - gnupg-agent \ less \ libz-dev \ locales \ From ac57c4bb89f1b392e1fd9fe07966e8a13357ffda Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 23:05:46 +0200 Subject: [PATCH 5/9] Dockerfile: gpg-agent only --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d45516f9f..f0a587e59c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,7 @@ RUN apt-get update \ g++ \ gawk \ git \ - gpg \ - gnupg \ + gpg-agent \ less \ libz-dev \ locales \ From 7d1a97f015ade9b93217246a785908e9b3fd3690 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 23:25:30 +0200 Subject: [PATCH 6/9] Dockerfile: purge unneeded packages --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0a587e59c..28e953cdba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ + && apt-get install -y --no-install-recommends software-properties-common gnupg-agent \ && add-apt-repository -y ppa:git-core/ppa \ && apt-get update \ && apt-get install -y --no-install-recommends \ @@ -17,7 +17,6 @@ RUN apt-get update \ g++ \ gawk \ git \ - gpg-agent \ less \ libz-dev \ locales \ @@ -28,6 +27,8 @@ RUN apt-get update \ sudo \ uuid-runtime \ tzdata \ + && apt remove --purge software-properties-common gnupg-agent \ + && apt autoremove --purge \ && rm -rf /var/lib/apt/lists/* \ && localedef -i en_US -f UTF-8 en_US.UTF-8 \ && useradd -m -s /bin/bash linuxbrew \ From e75218c0e9294637fe409482346f79a57ac16ad7 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 24 Apr 2022 23:31:03 +0200 Subject: [PATCH 7/9] Dockerfile: yes apt --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28e953cdba..71941ac72b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,8 +27,8 @@ RUN apt-get update \ sudo \ uuid-runtime \ tzdata \ - && apt remove --purge software-properties-common gnupg-agent \ - && apt autoremove --purge \ + && apt remove --purge -y software-properties-common gnupg-agent \ + && apt autoremove --purge -y \ && rm -rf /var/lib/apt/lists/* \ && localedef -i en_US -f UTF-8 en_US.UTF-8 \ && useradd -m -s /bin/bash linuxbrew \ From 6797cd3dcb580e03d26e601d9ab2a949e1bdd55e Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 25 Apr 2022 07:56:36 +0200 Subject: [PATCH 8/9] Dockerfile: leave gpg-agent installed --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71941ac72b..855ee3d2ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common gnupg-agent \ + && apt-get install -y --no-install-recommends software-properties-common gpg-agent \ && add-apt-repository -y ppa:git-core/ppa \ && apt-get update \ && apt-get install -y --no-install-recommends \ @@ -27,7 +27,7 @@ RUN apt-get update \ sudo \ uuid-runtime \ tzdata \ - && apt remove --purge -y software-properties-common gnupg-agent \ + && apt remove --purge -y software-properties-common \ && apt autoremove --purge -y \ && rm -rf /var/lib/apt/lists/* \ && localedef -i en_US -f UTF-8 en_US.UTF-8 \ From 1d04f44272a02f54d3814c04515e729036854e55 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 25 Apr 2022 07:59:51 +0200 Subject: [PATCH 9/9] Dockerfile: it's gnupg not gpg on 16.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 855ee3d2ff..9c20b42125 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common gpg-agent \ + && apt-get install -y --no-install-recommends software-properties-common gnupg-agent \ && add-apt-repository -y ppa:git-core/ppa \ && apt-get update \ && apt-get install -y --no-install-recommends \