Skip to content

Commit 55730c7

Browse files
fredericosilvafredericosilva
committed
php: use imagick from the upstream
1 parent 4e5d40f commit 55730c7

File tree

14 files changed

+26
-67
lines changed

14 files changed

+26
-67
lines changed

‎php-apache/5.6/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM chialab/php:5.6-apache
22
LABEL maintainer="HyperOne"
33
LABEL rbx.shell_image="h1cr.io/website/php-apache-shell:5.6"
4-
ENV IMAGICK_VERSION="3.4.4"
54
COPY ./site.conf /etc/apache2/sites-available/000-default.conf
65
COPY ./ports.conf /etc/apache2/ports.conf
76
RUN sed -i 's@Directory /var/www/@Directory /data/public@g' /etc/apache2/conf-available/docker-php.conf /etc/apache2/apache2.conf
@@ -10,12 +9,9 @@ RUN curl "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(u
109
&& tar -xzvf /tmp/ioncube.tar.gz --strip-components=1 -C "$extension_dir" "ioncube/ioncube_loader_lin_5.6.so" \
1110
&& chown root:staff "$extension_dir/ioncube_loader_lin_5.6.so" \
1211
&& rm /tmp/ioncube.tar.gz
13-
RUN apt-get update \
14-
# Following command add 200 MB dependencies
15-
&& apt-get install -y --no-install-recommends zlib1g-dev libcurl3-dev libpng-dev libmagickwand-dev locales \
16-
&& rm -rf /var/lib/apt/lists/*
17-
RUN pecl install imagick-"$IMAGICK_VERSION" \
18-
&& docker-php-ext-enable imagick
12+
RUN apt-get update && apt-get install -y \
13+
locales \
14+
&& rm -rf /var/lib/apt/lists/*
1915
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
2016
&& dpkg-reconfigure --frontend=noninteractive locales \
2117
&& update-locale LANG=en_US.UTF-8

‎php-apache/5.6/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Następujące zmienne środowiskowe są ustawione w środowisku:
9595

9696
| Zmienna środowiskowa | Opis |
9797
| --------------------- | ---------------------------------- |
98-
| ```IMAGICK_VERSION``` | Dostępna wersja biblioteki Imagick |
9998
| ```PHP_VERSION``` | Dostępna wersja interpretera PHP |
10099
| ```WP_CLI``` | Dostępna wersja narzędzia WP-CLI |
101100

‎php-apache/7.2/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM chialab/php:7.2-apache
22
LABEL maintainer="HyperOne"
33
LABEL rbx.shell_image="h1cr.io/website/php-apache-shell:7.2"
4-
ENV IMAGICK_VERSION="3.4.4"
54
COPY ./site.conf /etc/apache2/sites-available/000-default.conf
65
COPY ./ports.conf /etc/apache2/ports.conf
76
RUN sed -i 's@Directory /var/www/@Directory /data/public@g' /etc/apache2/conf-available/docker-php.conf /etc/apache2/apache2.conf
@@ -10,12 +9,9 @@ RUN curl "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(u
109
&& tar -xzvf /tmp/ioncube.tar.gz --strip-components=1 -C "$extension_dir" "ioncube/ioncube_loader_lin_7.2.so" \
1110
&& chown root:staff "$extension_dir/ioncube_loader_lin_7.2.so" \
1211
&& rm /tmp/ioncube.tar.gz
13-
RUN apt-get update \
14-
# Following command add 200 MB dependencies
15-
&& apt-get install -y --no-install-recommends zlib1g-dev libcurl3-dev libpng-dev libmagickwand-dev locales \
16-
&& rm -rf /var/lib/apt/lists/*
17-
RUN pecl install imagick-"$IMAGICK_VERSION" \
18-
&& docker-php-ext-enable imagick
12+
RUN apt-get update && apt-get install -y \
13+
locales \
14+
&& rm -rf /var/lib/apt/lists/*
1915
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
2016
&& dpkg-reconfigure --frontend=noninteractive locales \
2117
&& update-locale LANG=en_US.UTF-8

‎php-apache/7.2/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Następujące zmienne środowiskowe są ustawione w środowisku:
9595

9696
| Zmienna środowiskowa | Opis |
9797
| --------------------- | ---------------------------------- |
98-
| ```IMAGICK_VERSION``` | Dostępna wersja biblioteki Imagick |
9998
| ```PHP_VERSION``` | Dostępna wersja interpretera PHP |
10099
| ```WP_CLI``` | Dostępna wersja narzędzia WP-CLI |
101100

‎php-apache/7.3/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM chialab/php:7.3-apache
22
LABEL maintainer="HyperOne"
33
LABEL rbx.shell_image="h1cr.io/website/php-apache-shell:7.3"
4-
ENV IMAGICK_VERSION="3.4.4"
54
COPY ./site.conf /etc/apache2/sites-available/000-default.conf
65
COPY ./ports.conf /etc/apache2/ports.conf
76
RUN sed -i 's@Directory /var/www/@Directory /data/public@g' /etc/apache2/conf-available/docker-php.conf /etc/apache2/apache2.conf
@@ -14,8 +13,9 @@ RUN apt-get update \
1413
# Following command add 200 MB dependencies
1514
&& apt-get install -y --no-install-recommends zlib1g-dev libcurl3-dev libpng-dev libmagickwand-dev locales \
1615
&& rm -rf /var/lib/apt/lists/*
17-
RUN pecl install imagick-"$IMAGICK_VERSION" \
18-
&& docker-php-ext-enable imagick
16+
RUN apt-get update && apt-get install -y \
17+
locales \
18+
&& rm -rf /var/lib/apt/lists/*
1919
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
2020
&& dpkg-reconfigure --frontend=noninteractive locales \
2121
&& update-locale LANG=en_US.UTF-8

‎php-apache/7.3/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Następujące zmienne środowiskowe są ustawione w środowisku:
9595

9696
| Zmienna środowiskowa | Opis |
9797
| --------------------- | ---------------------------------- |
98-
| ```IMAGICK_VERSION``` | Dostępna wersja biblioteki Imagick |
9998
| ```PHP_VERSION``` | Dostępna wersja interpretera PHP |
10099
| ```WP_CLI``` | Dostępna wersja narzędzia WP-CLI |
101100

‎php-apache/7.4/Dockerfile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM chialab/php:7.4-apache
22
LABEL maintainer="HyperOne"
33
LABEL rbx.shell_image="h1cr.io/website/php-apache-shell:7.4"
4-
ENV IMAGICK_VERSION="3.4.4"
54
COPY ./site.conf /etc/apache2/sites-available/000-default.conf
65
COPY ./ports.conf /etc/apache2/ports.conf
76
RUN sed -i 's@Directory /var/www/@Directory /data/public@g' /etc/apache2/conf-available/docker-php.conf /etc/apache2/apache2.conf
@@ -10,12 +9,9 @@ RUN curl "https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_$(u
109
&& tar -xzvf /tmp/ioncube.tar.gz --strip-components=1 -C "$extension_dir" "ioncube/ioncube_loader_lin_7.4.so" \
1110
&& chown root:staff "$extension_dir/ioncube_loader_lin_7.4.so" \
1211
&& rm /tmp/ioncube.tar.gz
13-
RUN apt-get update \
14-
# Following command add 200 MB dependencies
15-
&& apt-get install -y --no-install-recommends zlib1g-dev libcurl3-dev libpng-dev libmagickwand-dev locales \
16-
&& rm -rf /var/lib/apt/lists/*
17-
RUN pecl install imagick-"$IMAGICK_VERSION" \
18-
&& docker-php-ext-enable imagick
12+
RUN apt-get update && apt-get install -y \
13+
locales \
14+
&& rm -rf /var/lib/apt/lists/*
1915
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
2016
&& dpkg-reconfigure --frontend=noninteractive locales \
2117
&& update-locale LANG=en_US.UTF-8

‎php-apache/7.4/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Następujące zmienne środowiskowe są ustawione w środowisku:
9595

9696
| Zmienna środowiskowa | Opis |
9797
| --------------------- | ---------------------------------- |
98-
| ```IMAGICK_VERSION``` | Dostępna wersja biblioteki Imagick |
9998
| ```PHP_VERSION``` | Dostępna wersja interpretera PHP |
10099
| ```WP_CLI``` | Dostępna wersja narzędzia WP-CLI |
101100

‎php-apache/8.0/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
FROM chialab/php:8.0-apache
22
LABEL maintainer="HyperOne"
33
LABEL rbx.shell_image="h1cr.io/website/php-apache-shell:8.0"
4-
ENV IMAGICK_VERSION="3.4.4"
54
COPY ./site.conf /etc/apache2/sites-available/000-default.conf
65
COPY ./ports.conf /etc/apache2/ports.conf
76
RUN sed -i 's@Directory /var/www/@Directory /data/public@g' /etc/apache2/conf-available/docker-php.conf /etc/apache2/apache2.conf
8-
RUN apt-get update \
9-
# Following command add 200 MB dependencies
10-
&& apt-get install -y --no-install-recommends zlib1g-dev libcurl3-dev libpng-dev libmagickwand-dev locales \
11-
&& rm -rf /var/lib/apt/lists/*
12-
# use github version for now until release from https://pecl.php.net/get/imagick is ready for PHP 8
13-
RUN mkdir -p /usr/src/php/ext/imagick; \
14-
curl -fsSL https://github.com/Imagick/imagick/archive/06116aa24b76edaf6b1693198f79e6c295eda8a9.tar.gz | tar xvz -C "/usr/src/php/ext/imagick" --strip 1; \
15-
docker-php-ext-install imagick && docker-php-ext-install imagick
7+
RUN apt-get update && apt-get install -y \
8+
locales \
9+
&& rm -rf /var/lib/apt/lists/*
1610
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
1711
&& dpkg-reconfigure --frontend=noninteractive locales \
1812
&& update-locale LANG=en_US.UTF-8

‎php-apache/8.0/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ Następujące zmienne środowiskowe są ustawione w środowisku:
9696

9797
| Zmienna środowiskowa | Opis |
9898
| --------------------- | ---------------------------------- |
99-
| ```IMAGICK_VERSION``` | Dostępna wersja biblioteki Imagick |
10099
| ```PHP_VERSION``` | Dostępna wersja interpretera PHP |
101100
| ```WP_CLI``` | Dostępna wersja narzędzia WP-CLI |
102101

0 commit comments

Comments
 (0)