From ed38bf106153d6be46200d3829e85f7ba7b8ba88 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 14 Mar 2023 12:25:00 -0400
Subject: [PATCH] Dockerfile: fix build of Ubuntu 18.04 image.

Some of these packages are only available on newer versions.
---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 22769b3d37..04bdf761d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,9 +23,7 @@ RUN apt-get update \
   fonts-dejavu-core \
   g++ \
   gawk \
-  gh \
   git \
-  gpg \
   less \
   libz-dev \
   locales \
@@ -33,13 +31,12 @@ RUN apt-get update \
   netbase \
   openssh-client \
   patch \
-  skopeo \
   sudo \
   unzip \
   uuid-runtime \
   tzdata \
   jq \
-  && if [[ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -ge 18 ]]; then apt-get install gpg; fi \
+  && if [[ "$(. /etc/lsb-release; echo "${DISTRIB_RELEASE}" | cut -d. -f1)" -ge 18 ]]; then apt-get install gh gpg skopeo; fi \
   && apt-get remove --purge -y software-properties-common \
   && apt-get autoremove --purge -y \
   && rm -rf /var/lib/apt/lists/* \