ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added workspace from env file and updated env-example

This commit is contained in:
Marius van Zundert 2017-02-27 13:53:40 +01:00
parent 3f13aa4f50
commit fa9ac1e471
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docker-compose.yml
View File

@ -14,25 +14,25 @@ services:
workspace: workspace:
build: build:
context: ./workspace context: ./workspace
args: args:
- INSTALL_XDEBUG=false - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
- INSTALL_SOAP=false - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP}
- INSTALL_MONGO=false - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO}
- INSTALL_NODE=false - INSTALL_NODE=${WORKSPACE_INSTALL_NODE}
- INSTALL_YARN=false - INSTALL_YARN=${WORKSPACE_INSTALL_YARN}
- INSTALL_DRUSH=false - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
- INSTALL_AEROSPIKE_EXTENSION=false - INSTALL_AEROSPIKE_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION}
- INSTALL_V8JS_EXTENSION=false - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION}
- COMPOSER_GLOBAL_INSTALL=false - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
- INSTALL_WORKSPACE_SSH=false - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH}
- INSTALL_LARAVEL_ENVOY=false - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
- INSTALL_DEPLOYER=false - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
- INSTALL_LINUXBREW=false - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LARAVEL_ENVOY}
- PUID=1000 - PUID=${WORKSPACE_PUID}
- PGID=1000 - PGID=${WORKSPACE_PGID}
- NODE_VERSION=stable - NODE_VERSION=${WORKSPACE_NODE_VERSION}
- YARN_VERSION=latest - YARN_VERSION=${WORKSPACE_TIMEZONE}
- TZ=UTC - TZ=${WORKSPACE_TIMEZONE=UTC}
volumes_from: volumes_from:
- applications - applications
extra_hosts: extra_hosts:

7
env-example
View File

@ -20,16 +20,19 @@ APPLICATIONS_IMAGE_NAME=tianon/true
APPLICATIONS_CONTAINER_NAME=applications APPLICATIONS_CONTAINER_NAME=applications
# WORKSPACE # WORKSPACE
WORKSPACE_BUILD_PATH=./workspace
WORKSPACE_CONTAINER_NAME=workspace
WORKSPACE_INSTALL_XDEBUG=false WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_SOAP=false
WORKSPACE_INSTALL_MONGO=false WORKSPACE_INSTALL_MONGO=false
WORKSPACE_INSTALL_NODE=false WORKSPACE_INSTALL_NODE=false
WORKSPACE_INSTALL_YARN=false WORKSPACE_INSTALL_YARN=false
WORKSPACE_INSTALL_DRUSH=false WORKSPACE_INSTALL_DRUSH=false
WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false
WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION=false
WORKSPACE_COMPOSER_GLOBAL_INSTALL=false WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
WORKSPACE_INSTALL_WORKSPACE_SSH=false WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_LARAVEL_ENVOY=false
WORKSPACE_INSTALL_DEPLOYER=false
WORKSPACE_INSTALL_LINUXBREW=false
WORKSPACE_PUID=1000 WORKSPACE_PUID=1000
WORKSPACE_PGID=1000 WORKSPACE_PGID=1000
WORKSPACE_NODE_VERSION=stable WORKSPACE_NODE_VERSION=stable