Skip to content

Commit

Permalink
[php-worker] dedicated dockerfile for php 7.0/7.1
Browse files Browse the repository at this point in the history
fixes laradock#927: PHP-Worker container uses PHP-CLI 7.0.9 despite workspace using 7.1.4
  • Loading branch information
Patrick Mac Gregor committed Aug 17, 2017
1 parent 38fb49b commit 9ce470e
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 4 deletions.
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ services:
php-worker:
build:
context: ./php-worker
dockerfile: "Dockerfile-${PHP_VERSION}"
volumes_from:
- applications
depends_on:
Expand Down
27 changes: 23 additions & 4 deletions php-worker/Dockerfile → php-worker/Dockerfile-70
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,30 @@
# Image Setup
#--------------------------------------------------------------------------
#
# To take a look at the'php-worker' base Image, visit its DockerHub page
# https://hub.docker.com/r/nielsvdoorn/laravel-supervisor/
#

FROM nielsvdoorn/laravel-supervisor
FROM php:7.0-alpine

MAINTAINER Mahmoud Zalt <[email protected]>

RUN apk --update add wget \
curl \
git \
build-base \
libmemcached-dev \
libmcrypt-dev \
libxml2-dev \
zlib-dev \
autoconf \
cyrus-sasl-dev \
libgsasl-dev \
supervisor

RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached

RUN rm /var/cache/apk/* \
&& mkdir -p /var/www

#
#--------------------------------------------------------------------------
# Optional Supervisord Configuration
Expand All @@ -19,8 +35,11 @@ MAINTAINER Mahmoud Zalt <[email protected]>
# Modify the ./supervisor.conf file to match your App's requirements.
# Make sure you rebuild your container with every change.
#

COPY supervisord.conf /etc/supervisord.conf

ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"]

#
#--------------------------------------------------------------------------
# Optional Software's Installation
Expand Down
59 changes: 59 additions & 0 deletions php-worker/Dockerfile-71
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#
#--------------------------------------------------------------------------
# Image Setup
#--------------------------------------------------------------------------
#

FROM php:7.1-alpine

MAINTAINER Mahmoud Zalt <[email protected]>

RUN apk --update add wget \
curl \
git \
build-base \
libmemcached-dev \
libmcrypt-dev \
libxml2-dev \
zlib-dev \
autoconf \
cyrus-sasl-dev \
libgsasl-dev \
supervisor

RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql mcrypt tokenizer xml
RUN pecl channel-update pecl.php.net && pecl install memcached && docker-php-ext-enable memcached

RUN rm /var/cache/apk/* \
&& mkdir -p /var/www

#
#--------------------------------------------------------------------------
# Optional Supervisord Configuration
#--------------------------------------------------------------------------
#
# Modify the ./supervisor.conf file to match your App's requirements.
# Make sure you rebuild your container with every change.
#

COPY supervisord.conf /etc/supervisord.conf

ENTRYPOINT ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"]

#
#--------------------------------------------------------------------------
# Optional Software's Installation
#--------------------------------------------------------------------------
#
# If you need to modify this image, feel free to do it right here.
#
# -- Your awesome modifications go here -- #


#
#--------------------------------------------------------------------------
# Final Touch
#--------------------------------------------------------------------------
#

WORKDIR /etc/supervisor/conf.d/

0 comments on commit 9ce470e

Please sign in to comment.