Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
b2e37205
Commit
b2e37205
authored
Sep 05, 2017
by
Arhey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed php-fpm build
parent
0a23d53e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
6 deletions
+14
-6
docker-compose.yml
docker-compose.yml
+1
-0
env-example
env-example
+1
-0
Dockerfile-56
php-fpm/Dockerfile-56
+3
-1
Dockerfile-70
php-fpm/Dockerfile-70
+3
-1
Dockerfile-71
php-fpm/Dockerfile-71
+3
-1
Dockerfile-56
workspace/Dockerfile-56
+1
-1
Dockerfile-70
workspace/Dockerfile-70
+1
-1
Dockerfile-71
workspace/Dockerfile-71
+1
-1
No files found.
docker-compose.yml
View file @
b2e37205
...
@@ -82,6 +82,7 @@ services:
...
@@ -82,6 +82,7 @@ services:
-
INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
-
INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
-
INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
-
INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
-
INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
-
INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
-
INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
dockerfile
:
"
Dockerfile-${PHP_VERSION}"
dockerfile
:
"
Dockerfile-${PHP_VERSION}"
volumes_from
:
volumes_from
:
-
applications
-
applications
...
...
env-example
View file @
b2e37205
...
@@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
...
@@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
PHP_FPM_INSTALL_LDAP=false
PHP_FPM_INSTALL_LDAP=false
PHP_FPM_INSTALL_SWOOLE=false
PHP_FPM_INSTALL_SWOOLE=false
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
PHP_FPM_INSTALL_IMAGEMAGICK=false
### NGINX ##############################################################################################################
### NGINX ##############################################################################################################
...
...
php-fpm/Dockerfile-56
View file @
b2e37205
...
@@ -276,7 +276,9 @@ USER root
...
@@ -276,7 +276,9 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick php-imagick && \
apt-get update -y && \
apt-get install -y libmagickwand-dev imagemagick && \
pecl install imagick && \
docker-php-ext-enable imagick \
docker-php-ext-enable imagick \
;fi
;fi
...
...
php-fpm/Dockerfile-70
View file @
b2e37205
...
@@ -300,7 +300,9 @@ USER root
...
@@ -300,7 +300,9 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick php-imagick && \
apt-get update -y && \
apt-get install -y libmagickwand-dev imagemagick && \
pecl install imagick && \
docker-php-ext-enable imagick \
docker-php-ext-enable imagick \
;fi
;fi
...
...
php-fpm/Dockerfile-71
View file @
b2e37205
...
@@ -307,7 +307,9 @@ USER root
...
@@ -307,7 +307,9 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick php-imagick && \
apt-get update -y && \
apt-get install -y libmagickwand-dev imagemagick && \
pecl install imagick && \
docker-php-ext-enable imagick \
docker-php-ext-enable imagick \
;fi
;fi
...
...
workspace/Dockerfile-56
View file @
b2e37205
...
@@ -503,7 +503,7 @@ USER root
...
@@ -503,7 +503,7 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick \
apt-get install -y --force-yes imagemagick
php-imagick
\
;fi
;fi
#
#
...
...
workspace/Dockerfile-70
View file @
b2e37205
...
@@ -584,7 +584,7 @@ USER root
...
@@ -584,7 +584,7 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick \
apt-get install -y --force-yes imagemagick
php-imagick
\
;fi
;fi
#
#
...
...
workspace/Dockerfile-71
View file @
b2e37205
...
@@ -589,7 +589,7 @@ USER root
...
@@ -589,7 +589,7 @@ USER root
ARG INSTALL_IMAGEMAGICK=false
ARG INSTALL_IMAGEMAGICK=false
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK}
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y --force-yes imagemagick \
apt-get install -y --force-yes imagemagick
php-imagick
\
;fi
;fi
#
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment