Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move gnupg installation to Dockerfile
Browse files Browse the repository at this point in the history
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.
andrewnicols committed Mar 15, 2023
1 parent 48c6827 commit 1c624f9
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion root/tmp/setup/php-extensions.sh
Original file line number Diff line number Diff line change
@@ -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"

2 changes: 1 addition & 1 deletion root/tmp/setup/sqlsrv-extension.sh
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 1c624f9

Please sign in to comment.