Skip to content

Commit

Permalink
try to fix imagemagick, amqp
Browse files Browse the repository at this point in the history
  • Loading branch information
@htuscher
htuscher committed Apr 21, 2021
1 parent 5fca0e6 commit a353421
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 48 deletions.
2 changes: 1 addition & 1 deletion docker/php-official/5.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ RUN set -x \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
bcmath \
bz2 \
calendar \
exif \
Expand Down
19 changes: 8 additions & 11 deletions docker/php-official/8.0-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,17 +202,14 @@ RUN set -x \
&& docker-php-ext-configure $MEMCACHED \
&& docker-php-ext-install $MEMCACHED \
&& rm -rf $MEMCACHED \
&& wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar \
&& mv pickle.phar /usr/local/bin/pickle \
&& chmod +x /usr/local/bin/pickle \
&& pickle install memcached \
&& pickle install apcu \
&& pickle install vips \
&& pickle install yaml \
&& pickle install redis \
&& pickle install mongodb \
#&& pickle install imagick \
#&& pickle install amqp \
&& pecl install memcached \
&& pecl install apcu \
&& pecl install vips \
&& pecl install yaml \
&& pecl install redis \
&& pecl install mongodb \
#&& pecl install imagick \
#&& pecl install amqp \
&& docker-php-ext-enable \
apcu \
vips \
Expand Down
20 changes: 10 additions & 10 deletions docker/php-official/8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,15 @@ RUN set -x \
# Install extensions
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
amqp \
imagick \
bz2 \
calendar \
exif \
Expand All @@ -189,16 +194,11 @@ RUN set -x \
gd \
gettext \
opcache \
&& wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.2/pickle.phar \
&& mv pickle.phar /usr/local/bin/pickle \
&& chmod +x /usr/local/bin/pickle \
&& pickle install memcached \
&& pickle install apcu \
&& pickle install vips \
&& pickle install redis \
&& pickle install mongodb \
&& pickle install imagick \
&& pickle install amqp \
&& pecl install memcached \
&& pecl install apcu \
&& pecl install vips \
&& pecl install redis \
&& pecl install mongodb \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
Expand Down
43 changes: 22 additions & 21 deletions template/Dockerfile/images/php.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,20 @@
{%- else %}
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
{%- endif %}
{%- if version == '8.0' %}
&& git clone --branch master --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
{%- endif %}
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& docker-php-ext-install \
bcmath \
{%- if version == '8.0' %}
amqp \
imagick \
{%- endif %}
bz2 \
calendar \
exif \
Expand Down Expand Up @@ -116,16 +125,11 @@
&& echo extension=mongodb.so > /usr/local/etc/php/conf.d/mongodb.ini \
&& echo extension=memcached.so > /usr/local/etc/php/conf.d/memcached.ini \
{%- elif version == '8.0' %}
&& wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.2/pickle.phar \
&& mv pickle.phar /usr/local/bin/pickle \
&& chmod +x /usr/local/bin/pickle \
&& pickle install memcached \
&& pickle install apcu \
&& pickle install vips \
&& pickle install redis \
&& pickle install mongodb \
&& pickle install imagick \
&& pickle install amqp \
&& pecl install memcached \
&& pecl install apcu \
&& pecl install vips \
&& pecl install redis \
&& pecl install mongodb \
{%- else %}
# Install extensions for PHP 7.x
&& pecl install apcu \
Expand Down Expand Up @@ -287,17 +291,14 @@
&& docker-php-ext-enable memcached \
{%- endif %}
{%- if version == '8.0' %}
&& wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.6.0/pickle.phar \
&& mv pickle.phar /usr/local/bin/pickle \
&& chmod +x /usr/local/bin/pickle \
&& pickle install memcached \
&& pickle install apcu \
&& pickle install vips \
&& pickle install yaml \
&& pickle install redis \
&& pickle install mongodb \
#&& pickle install imagick \
#&& pickle install amqp \
&& pecl install memcached \
&& pecl install apcu \
&& pecl install vips \
&& pecl install yaml \
&& pecl install redis \
&& pecl install mongodb \
#&& pecl install imagick \
#&& pecl install amqp \
&& docker-php-ext-enable \
apcu \
vips \
Expand Down

0 comments on commit a353421

Please sign in to comment.