diff --git a/Dockerfile-php b/Dockerfile-php index 3208968..8ebcfbe 100644 --- a/Dockerfile-php +++ b/Dockerfile-php @@ -57,7 +57,7 @@ RUN apt-get -y install readline-common git zlib1g-dev \ php${PHP_VERSION}-curl php${PHP_VERSION}-fpm php${PHP_VERSION}-gd php${PHP_VERSION}-gmp \ php${PHP_VERSION}-imagick php${PHP_VERSION}-intl php${PHP_VERSION}-mbstring \ php${PHP_VERSION}-mysql php${PHP_VERSION}-opcache php${PHP_VERSION}-readline php${PHP_VERSION}-sqlite3 \ - php${PHP_VERSION}-xml php${PHP_VERSION}-yaml php${PHP_VERSION}-zip \ + php${PHP_VERSION}-xml php${PHP_VERSION}-yaml php${PHP_VERSION}-zip php${PHP_VERSION}-apcu \ libapache2-mod-php${PHP_VERSION} # specific PHP modules for some versions @@ -65,8 +65,8 @@ RUN if [[ "${PHP_VERSION}" == "7.4" ]] ; then apt-get -y install php${PHP_VERSIO # install wkhtml if needed RUN if [[ "${WKHTML}" != "" ]] ; then \ - apt-get install -y --no-install-recommends libfreetype6-dev libjpeg62-turbo-dev libpng-dev; \ - apt-get install --no-install-recommends -y fontconfig libfreetype6 libjpeg62-turbo libpng16-16 libx11-6 libxcb1 libxext6 libxrender1 xfonts-75dpi xfonts-base; \ + apt-get install -y --no-install-recommends libfreetype6-dev libjpeg62-turbo-dev libpng-dev fontconfig libfreetype6 libjpeg62-turbo \ + libpng16-16 libx11-6 libxcb1 libxext6 libxrender1 xfonts-75dpi xfonts-base; \ curl -L https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_arm64.deb -o /tmp/wkhtmltox.deb; \ dpkg -i /tmp/wkhtmltox.deb; \ fi diff --git a/build.sh b/build.sh index 3a7128d..df8258a 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,14 @@ #!/bin/bash -PHP_VERSIONS="7.4 8.2" +PHP_VERSIONS="7.4 8.1 8.2" WKHTML="" +PLATFORMS="linux/arm64/v8,linux/amd64" + +# testing +#PHP_VERSIONS="7.4" +#PHP_VERSIONS="8.1" +#PLATFORMS="linux/arm64/v8" +#PLATFORMS="linux/amd64" SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) @@ -11,7 +18,7 @@ function build() { echo "Building ${PACKAGE}" docker buildx build \ --no-cache \ - --platform=linux/arm64/v8,linux/amd64 \ + --platform=${PLATFORMS} \ --push \ -f "${SCRIPT_DIR}/Dockerfile-php" \ -t "git.paucapo.com/server/${PACKAGE}" \