From f42bb88f33c5e55928f6e61f8e5201bf6c2f23d4 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Mon, 9 Mar 2020 08:59:57 +0000 Subject: [PATCH 1/4] add support for oauth in docker image Fix https://github.com/cweiske/grauphel/issues/55 --- Dockerfile-debian.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 9345d2ef7..52dc34cd3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -37,6 +37,7 @@ RUN set -ex; \ libzip-dev \ libwebp-dev \ libgmp-dev \ + php-oauth \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ @@ -97,6 +98,8 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ + echo 'extension=oauth.so' >> /usr/local/etc/php/conf.d/oauth.ini; \ + \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ mkdir /var/www/data; \ From c6b8b57ba43094e30642649557e36508cb5394ce Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Mon, 9 Mar 2020 17:35:42 +0000 Subject: [PATCH 2/4] Update Dockerfile-debian.template --- Dockerfile-debian.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 52dc34cd3..7eca680e1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -56,6 +56,7 @@ RUN set -ex; \ pdo_pgsql \ zip \ gmp \ + oauth \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately @@ -98,8 +99,6 @@ RUN { \ \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ - echo 'extension=oauth.so' >> /usr/local/etc/php/conf.d/oauth.ini; \ - \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ \ mkdir /var/www/data; \ From 2a06f2a2c208e5fd83de149134b1187d93f2fcaf Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Sun, 15 Mar 2020 06:42:54 +0000 Subject: [PATCH 3/4] Update Dockerfile-debian.template --- Dockerfile-debian.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 7eca680e1..1d892c40a 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -37,7 +37,6 @@ RUN set -ex; \ libzip-dev \ libwebp-dev \ libgmp-dev \ - php-oauth \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ @@ -55,11 +54,11 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ - gmp \ - oauth \ + gmp ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately + pecl install oauth-%%OAUTH_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \ pecl install memcached-%%MEMCACHED_VERSION%%; \ pecl install redis-%%REDIS_VERSION%%; \ @@ -70,6 +69,7 @@ RUN set -ex; \ memcached \ redis \ imagick \ + oauth \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies From 1d148941f248bf2db0c2ad1953a434d9c5b5fa4a Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Sun, 15 Mar 2020 06:43:16 +0000 Subject: [PATCH 4/4] Update Dockerfile-debian.template --- Dockerfile-debian.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 1d892c40a..14ec19ff1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -54,7 +54,7 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ - gmp + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately