Commit cfc81fca authored by Tim Bracken's avatar Tim Bracken

Allow for config of crush and opcache in the main docker file

parent 928451ae
...@@ -11,6 +11,7 @@ services: ...@@ -11,6 +11,7 @@ services:
- INSTALL_MONGO=false - INSTALL_MONGO=false
- INSTALL_XDEBUG=false - INSTALL_XDEBUG=false
- INSTALL_NODE=false - INSTALL_NODE=false
- INSTALL_DRUSH=false
- COMPOSER_GLOBAL_INSTALL=false - COMPOSER_GLOBAL_INSTALL=false
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
...@@ -33,6 +34,7 @@ services: ...@@ -33,6 +34,7 @@ services:
- INSTALL_XDEBUG=false - INSTALL_XDEBUG=false
- INSTALL_ZIP_ARCHIVE=false - INSTALL_ZIP_ARCHIVE=false
- INSTALL_MEMCACHED=false - INSTALL_MEMCACHED=false
- INSTALL_OPCACHE=false
dockerfile: Dockerfile-70 dockerfile: Dockerfile-70
volumes_from: volumes_from:
- volumes_source - volumes_source
......
...@@ -92,8 +92,12 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \ ...@@ -92,8 +92,12 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
##################################### #####################################
# Opcache: # Opcache:
##################################### #####################################
RUN docker-php-ext-install opcache ARG INSTALL_OPCACHE=true
RUN docker-php-ext-enable opcache ENV INSTALL_OPCACHE ${INSTALL_OPCACHE}
RUN if [ ${INSTALL_OPCACHE} = true ]; then \
docker-php-ext-install opcache && \
docker-php-ext-enable opcache \
;fi
# #
......
...@@ -103,8 +103,13 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \ ...@@ -103,8 +103,13 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
##################################### #####################################
# Opcache: # Opcache:
##################################### #####################################
RUN docker-php-ext-install opcache ARG INSTALL_OPCACHE=true
RUN docker-php-ext-enable opcache ENV INSTALL_OPCACHE ${INSTALL_OPCACHE}
RUN if [ ${INSTALL_OPCACHE} = true ]; then \
docker-php-ext-install opcache && \
docker-php-ext-enable opcache \
;fi
# #
......
...@@ -37,6 +37,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> ...@@ -37,6 +37,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
# - INSTALL_MONGO= false # - INSTALL_MONGO= false
# - COMPOSER_GLOBAL_INSTALL= false # - COMPOSER_GLOBAL_INSTALL= false
# - INSTALL_NODE= false # - INSTALL_NODE= false
# - INSTALL_drush= false
# #
##################################### #####################################
...@@ -100,16 +101,18 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \ ...@@ -100,16 +101,18 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
##################################### #####################################
# Drush: # Drush:
##################################### #####################################
ENV DRUSH_VERSION 8.1.2
# Install Drush 8 with the phar file.
USER root USER root
RUN curl -fsSL -o /usr/local/bin/drush "https://github.com/drush-ops/drush/releases/download/$DRUSH_VERSION/drush.phar" && \ ENV DRUSH_VERSION 8.1.2
chmod +x /usr/local/bin/drush ARG INSTALL_DRUSH=true
ENV INSTALL_DRUSH ${INSTALL_DRUSH}
RUN if [ ${INSTALL_DRUSH} = true ]; then \
# Install Drush 8 with the phar file.
curl -fsSL -o /usr/local/bin/drush https://github.com/drush-ops/drush/releases/download/$DRUSH_VERSION/drush.phar | bash && \
chmod +x /usr/local/bin/drush && \
drush core-status \
;fi
#Check if drush works for the laradock user
USER laradock USER laradock
RUN drush core-status
##################################### #####################################
# Node / NVM: # Node / NVM:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment