Move php-imagick to php-fpm and enable it

freearhey · freearhey · commit 0a23d53ee564 · 2017-09-05T21:47:47.000+03:00
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
@@ -276,7 +276,8 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick php-imagick && \
+    docker-php-ext-enable imagick \
 ;fi
 
 #
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
@@ -300,7 +300,8 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick php-imagick && \
+    docker-php-ext-enable imagick \
 ;fi
 
 #
diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71
@@ -307,7 +307,8 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick php-imagick && \
+    docker-php-ext-enable imagick \
 ;fi
 
 #
diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
@@ -503,7 +503,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick \
 ;fi
 
 #
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
@@ -584,7 +584,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick \
 ;fi
 
 #
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
@@ -589,7 +589,7 @@ USER root
 ARG INSTALL_IMAGEMAGICK=false
 ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
 RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
-    apt-get install -y --force-yes imagemagick php-imagick \
+    apt-get install -y --force-yes imagemagick \
 ;fi
 
 #

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,8 @@ USER root`
`276`	`276`	`ARG INSTALL_IMAGEMAGICK=false`
`277`	`277`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`278`	`278`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`279`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`279`	`+ apt-get install -y --force-yes imagemagick php-imagick && \`
	`280`	`+ docker-php-ext-enable imagick \`
`280`	`281`	`;fi`
`281`	`282`
`282`	`283`	`#`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,8 @@ USER root`
`300`	`300`	`ARG INSTALL_IMAGEMAGICK=false`
`301`	`301`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`302`	`302`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`303`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`303`	`+ apt-get install -y --force-yes imagemagick php-imagick && \`
	`304`	`+ docker-php-ext-enable imagick \`
`304`	`305`	`;fi`
`305`	`306`
`306`	`307`	`#`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,8 @@ USER root`
`307`	`307`	`ARG INSTALL_IMAGEMAGICK=false`
`308`	`308`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`309`	`309`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`310`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`310`	`+ apt-get install -y --force-yes imagemagick php-imagick && \`
	`311`	`+ docker-php-ext-enable imagick \`
`311`	`312`	`;fi`
`312`	`313`
`313`	`314`	`#`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ USER root`
`503`	`503`	`ARG INSTALL_IMAGEMAGICK=false`
`504`	`504`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`505`	`505`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`506`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`506`	`+ apt-get install -y --force-yes imagemagick \`
`507`	`507`	`;fi`
`508`	`508`
`509`	`509`	`#`
Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ USER root`
`584`	`584`	`ARG INSTALL_IMAGEMAGICK=false`
`585`	`585`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`586`	`586`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`587`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`587`	`+ apt-get install -y --force-yes imagemagick \`
`588`	`588`	`;fi`
`589`	`589`
`590`	`590`	`#`
Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ USER root`
`589`	`589`	`ARG INSTALL_IMAGEMAGICK=false`
`590`	`590`	`ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}`
`591`	`591`	`RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \`
`592`		`- apt-get install -y --force-yes imagemagick php-imagick \`
	`592`	`+ apt-get install -y --force-yes imagemagick \`
`593`	`593`	`;fi`
`594`	`594`
`595`	`595`	`#`