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
cfc81fca
Commit
cfc81fca
authored
Aug 16, 2016
by
Tim Bracken
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow for config of crush and opcache in the main docker file
parent
928451ae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
11 deletions
+25
-11
docker-compose.yml
docker-compose.yml
+2
-0
Dockerfile-56
php-fpm/Dockerfile-56
+6
-2
Dockerfile-70
php-fpm/Dockerfile-70
+7
-2
Dockerfile
workspace/Dockerfile
+10
-7
No files found.
docker-compose.yml
View file @
cfc81fca
...
@@ -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
...
...
php-fpm/Dockerfile-56
View file @
cfc81fca
...
@@ -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
#
#
...
...
php-fpm/Dockerfile-70
View file @
cfc81fca
...
@@ -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
#
#
...
...
workspace/Dockerfile
View file @
cfc81fca
...
@@ -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:
...
...
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