From e71fb0ac7fc2f4288c8b87a06163e9f867a88281 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 2 Nov 2020 09:02:00 +0100 Subject: [PATCH 1/3] Added gmp extension to docker images, as it seems to be required by geolite in some cases --- Dockerfile | 6 +++++- data/infra/php.Dockerfile | 3 +++ data/infra/swoole.Dockerfile | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 41fce03a..ea0a1d9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ ENV LC_ALL "C" WORKDIR /etc/shlink +# Install required PHP extensions RUN \ # Install mysql and calendar docker-php-ext-install -j"$(nproc)" pdo_mysql calendar && \ @@ -21,7 +22,10 @@ RUN \ docker-php-ext-install -j"$(nproc)" intl && \ # Install zip and gd apk add --no-cache libzip-dev zlib-dev libpng-dev && \ - docker-php-ext-install -j"$(nproc)" zip gd + docker-php-ext-install -j"$(nproc)" zip gd && \ + # Install gmp + apk add --no-cache gmp-dev && \ + docker-php-ext-install -j"$(nproc)" gmp # Install sqlsrv driver RUN if [ $(uname -m) == "x86_64" ]; then \ diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile index 218db4c5..e419ba6b 100644 --- a/data/infra/php.Dockerfile +++ b/data/infra/php.Dockerfile @@ -30,6 +30,9 @@ RUN docker-php-ext-install gd RUN apk add --no-cache postgresql-dev RUN docker-php-ext-install pdo_pgsql +RUN apk add --no-cache gmp-dev +RUN docker-php-ext-install gmp + # Install APCu extension ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz RUN mkdir -p /usr/src/php/ext/apcu\ diff --git a/data/infra/swoole.Dockerfile b/data/infra/swoole.Dockerfile index 5d8485ab..00d197ba 100644 --- a/data/infra/swoole.Dockerfile +++ b/data/infra/swoole.Dockerfile @@ -32,6 +32,9 @@ RUN docker-php-ext-install gd RUN apk add --no-cache postgresql-dev RUN docker-php-ext-install pdo_pgsql +RUN apk add --no-cache gmp-dev +RUN docker-php-ext-install gmp + # Install APCu extension ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz RUN mkdir -p /usr/src/php/ext/apcu\ From 51c8b804890efd8c06b223ff0eb3628bc7abbc46 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 2 Nov 2020 09:24:14 +0100 Subject: [PATCH 2/3] Changed to for consistency in the Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea0a1d9d..04441788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN \ RUN if [ $(uname -m) == "x86_64" ]; then \ wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.1.1-1_amd64.apk && \ apk add --allow-untrusted msodbcsql17_17.5.1.1-1_amd64.apk && \ - apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \ + apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \ pecl install pdo_sqlsrv && \ docker-php-ext-enable pdo_sqlsrv && \ apk del .phpize-deps && \ @@ -39,7 +39,7 @@ RUN if [ $(uname -m) == "x86_64" ]; then \ fi # Install swoole -RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \ +RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \ pecl install swoole-${SWOOLE_VERSION} && \ docker-php-ext-enable swoole && \ apk del .phpize-deps From efa707c676e30a6c83d6d15f588a117409f40983 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 2 Nov 2020 09:25:17 +0100 Subject: [PATCH 3/3] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4ad7e7..f3379e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this ### Fixed * [#837](https://github.com/shlinkio/shlink/issues/837) Drastically improved performance when creating a new shortUrl and providing `findIfExists = true`. +* [#837](https://github.com/shlinkio/shlink/issues/837) Added missing `gmp` extension to the official docker image. ## [2.3.0] - 2020-08-09