From 1c624f9eea0a6abe02b1fa809880598319a8b9ab Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 15 Mar 2023 10:47:57 +0800 Subject: [PATCH] Move gnupg installation to Dockerfile We use gnupg for apt key verification so we should install it once to allow further streamlining of the build process. We currently install it and remove it multiple times, and because it is not a part of the base build, we have to do additional apt processes just to install it before we add custom repos. --- Dockerfile | 2 +- root/tmp/setup/php-extensions.sh | 2 +- root/tmp/setup/sqlsrv-extension.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fb5a03..c5f8b4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN echo "Building for ${TARGETPLATFORM}" # Install some packages that are useful within the images. RUN apt-get update && apt-get install -y \ - git \ + git gnupg \ && rm -rf /var/lib/apt/lists/* # Install pickle as an easier alternative to PECL, that is not diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index b8e3059..38c9ff1 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -5,7 +5,7 @@ set -e echo "Installing apt dependencies" # Build packages will be added during the build, but will be removed at the end. -BUILD_PACKAGES="gettext gnupg libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \ +BUILD_PACKAGES="gettext libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \ libldap2-dev libmariadb-dev libmemcached-dev libpng-dev libpq-dev libxml2-dev libxslt-dev \ uuid-dev" diff --git a/root/tmp/setup/sqlsrv-extension.sh b/root/tmp/setup/sqlsrv-extension.sh index f00385f..b672f88 100755 --- a/root/tmp/setup/sqlsrv-extension.sh +++ b/root/tmp/setup/sqlsrv-extension.sh @@ -8,7 +8,7 @@ if [[ ${TARGETPLATFORM} != "linux/amd64" ]]; then fi # Packages for build. -BUILD_PACKAGES="gnupg unixodbc-dev" +BUILD_PACKAGES="unixodbc-dev" # Packages for sqlsrv runtime. PACKAGES_SQLSRV="unixodbc"