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
a2058ca6
Commit
a2058ca6
authored
May 09, 2017
by
Sascha Brendel
Committed by
GitHub
May 09, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into adding-env-aerospike-rethinkdb-mongodb
parents
546ef0ad
aab2017b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
8 deletions
+49
-8
docker-compose.yml
docker-compose.yml
+6
-7
env-example
env-example
+9
-0
Dockerfile-56
php-fpm/Dockerfile-56
+11
-0
Dockerfile-70
php-fpm/Dockerfile-70
+11
-0
Dockerfile-71
php-fpm/Dockerfile-71
+12
-1
No files found.
docker-compose.yml
View file @
a2058ca6
...
...
@@ -399,16 +399,15 @@ services:
caddy
:
build
:
./caddy
ports
:
-
"
80:80"
-
"
443:443"
-
"
2015:2015"
volumes_from
:
-
applications
volumes
:
-
./caddy/Caddyfile:/etc/Caddyfile
-
./logs/caddy:/var/log/caddy
-
caddy:/root/.caddy
-
${CADDY_CUSTOM_CADDYFILE}:/etc/Caddyfile
-
${CADDY_HOST_LOG_PATH}:/var/log/caddy
-
${DATA_SAVE_PATH}:/root/.caddy
ports
:
-
"
${CADDY_HOST_HTTP_PORT}:80"
-
"
${CADDY_HOST_HTTPS_PORT}:443"
depends_on
:
-
php-fpm
networks
:
...
...
env-example
View file @
a2058ca6
...
...
@@ -68,6 +68,7 @@ PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_TOKENIZER=false
PHP_FPM_INSTALL_INTL=false
PHP_FPM_INSTALL_GHOSTSCRIPT=false
PHP_FPM_INSTALL_SWOOLE=false
### NGINX ##############################################################################################################
...
...
@@ -230,6 +231,14 @@ RETHINKDB_PORT=8090
MONGODB_PORT=27017
### CADDY ##############################################################################################################
CADDY_HOST_HTTP_PORT=80
CADDY_HOST_HTTPS_PORT=443
CADDY_HOST_LOG_PATH=./logs/caddy
CADDY_CUSTOM_CADDYFILE=./caddy/Caddyfile
##### TO BE CONTINUE .................................
# ......... Missing: neo4j mongo rethinkdb redis aerospike pgadmin...
...
...
php-fpm/Dockerfile-56
View file @
a2058ca6
...
...
@@ -92,6 +92,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
&& docker-php-ext-enable redis \
;fi
#####################################
# Swoole EXTENSION FOR PHP 5
#####################################
ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension
pecl install swoole \
&& docker-php-ext-enable swoole \
;fi
#####################################
# MongoDB:
#####################################
...
...
php-fpm/Dockerfile-70
View file @
a2058ca6
...
...
@@ -89,6 +89,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
&& docker-php-ext-enable redis \
;fi
#####################################
# Swoole EXTENSION FOR PHP 7
#####################################
ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension
pecl install swoole \
&& docker-php-ext-enable swoole \
;fi
#####################################
# MongoDB:
#####################################
...
...
php-fpm/Dockerfile-71
View file @
a2058ca6
...
...
@@ -89,6 +89,17 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
&& docker-php-ext-enable redis \
;fi
#####################################
# Swoole EXTENSION FOR PHP 7
#####################################
ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension
pecl install swoole \
&& docker-php-ext-enable swoole \
;fi
#####################################
# MongoDB:
#####################################
...
...
@@ -166,7 +177,7 @@ RUN if [ ${INSTALL_AEROSPIKE} = true ]; then \
# Fix dependencies for PHPUnit within aerospike extension
apt-get update -yqq && \
apt-get -y install sudo wget && \
# Install the php aerospike extension
curl -L -o /tmp/aerospike-client-php.tar.gz "https://github.com/aerospike/aerospike-client-php/archive/3.4.14.tar.gz" \
&& mkdir -p aerospike-client-php \
...
...
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