V2.0.0 beta2 (#11)

Author: Julien Neuhart

.docker/.orbit/orbit-build.yml

@@ -16,8 +16,10 @@ commands:
   # | orbit run toolbox-build
   # |--------------------------------------------------------------------------
   # |
-  # | Generates all configuration files plus the toolbox docker-compose file
-  # | and builds the toolbox container.
+  # | Generates the Toolbox container configuration files and builds it.
+  # |
+  # | If ENABLE_DOCKER_SYNC=true, also generates the Docker Sync configuration
+  # | file.
   # |
 
   - use: "toolbox-build"
@@ -37,7 +39,7 @@ commands:
   # | orbit run proxy-build
   # |--------------------------------------------------------------------------
   # |
-  # | Generates the configuration and docker-compose files for Traefik.
+  # | Generates the Traefik container configuration files.
   # |
 
   - use: "proxy-build"
@@ -49,7 +51,7 @@ commands:
   # | orbit run graylog-build
   # |--------------------------------------------------------------------------
   # |
-  # | Generates the configuration and docker-compose files for Graylog.
+  # | Generates the Graylog containers configuration files.
   # |
 
   - use: "graylog-build"
@@ -60,8 +62,8 @@ commands:
   # | orbit run build
   # |--------------------------------------------------------------------------
   # |
-  # | Generates all configuration files plus the main docker-compose file and
-  # | builds the NGINX and PHP-FPM containers.
+  # | Generates the configuration files of your services and builds the NGINX
+  # | and PHP-FPM containers.
   # |
 
   - use: "build"
@@ -77,4 +79,4 @@ commands:
       {{- if eq "linux" .Os }}
       - /bin/bash .docker/.bin/usermod.sh
       {{- end }}
-      - docker-compose -f .docker/docker-compose.yml build
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose.yml build

.docker/.orbit/orbit-docker-commands.yml

@@ -14,7 +14,7 @@ commands:
   # | orbit run toolbox-ash
   # |--------------------------------------------------------------------------
   # |
-  # | Connects through ash to the toolbox container.
+  # | Connects through ash to the Toolbox container.
   # |
 
   - use: "toolbox-ash"

.docker/.orbit/orbit-down.yml

@@ -16,7 +16,9 @@ commands:
   # | orbit run toolbox-down
   # |--------------------------------------------------------------------------
   # |
-  # | Stops the toolbox container.
+  # | Stops the Toolbox container.
+  # |
+  # | It should be the last to stop.
   # |
 
   - use: "toolbox-down"
@@ -27,28 +29,30 @@ commands:
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml down
 
   # |--------------------------------------------------------------------------
-  # | orbit run graylog-down
+  # | orbit run proxy-down
   # |--------------------------------------------------------------------------
   # |
-  # | Stops the Graylog containers.
+  # | Stops the Traefik container.
+  # |
+  # | It should be stop just before the Toolbox container.
   # |
 
-  - use: "graylog-down"
+  - use: "proxy-down"
     run:
-      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-graylog.yml down
+      - docker-compose -p kickoff -f .docker/docker-compose-proxy.yml down
 
   # |--------------------------------------------------------------------------
-  # | orbit run proxy-down
+  # | orbit run graylog-down
   # |--------------------------------------------------------------------------
   # |
-  # | Stops the Traefik container.
+  # | Stops the Graylog containers.
   # |
-  # | If your others containers are still running, make sure you have run "down".
+  # | They should be stop just before the Traefik container.
   # |
 
-  - use: "proxy-down"
+  - use: "graylog-down"
     run:
-      - docker-compose -p kickoff -f .docker/docker-compose-proxy.yml down
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-graylog.yml down
 
   # |--------------------------------------------------------------------------
   # | orbit run down
@@ -58,6 +62,8 @@ commands:
   # |
   # | On "local" environment, also stops the phpMyAdmin container.
   # |
+  # | They should be the first to stop.
+  # |
 
   - use: "down"
     run:

.docker/.orbit/orbit-up.yml

@@ -16,7 +16,9 @@ commands:
   # | orbit run toolbox-up
   # |--------------------------------------------------------------------------
   # |
-  # | Starts the toolbox container.
+  # | Starts the Toolbox container.
+  # |
+  # | It should be the first to start.
   # |
 
   - use: "toolbox-up"
@@ -32,6 +34,8 @@ commands:
   # |
   # | Starts the Traefik container.
   # |
+  # | It should be start after the Toolbox container.
+  # |
 
   - use: "proxy-up"
     run:
@@ -43,6 +47,8 @@ commands:
   # |
   # | Starts the Graylog containers.
   # |
+  # | They should be start after the Traefik container.
+  # |
 
   - use: "graylog-up"
     run:
@@ -56,7 +62,7 @@ commands:
   # |
   # | On "local" environment, also starts the phpMyAdmin container.
   # |
-  # | Make sure you have start other containers!
+  # | They should be the last to start.
   # |
 
   - use: "up"

.docker/php-fpm/Dockerfile.blueprint

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.1.7-fpm-alpine
 
 # |--------------------------------------------------------------------------
 # | Main PHP extensions

.docker/toolbox/Dockerfile.blueprint

@@ -1,4 +1,4 @@
-FROM php:7.1-alpine
+FROM php:7.1.7-alpine
 
 # |--------------------------------------------------------------------------
 # | Main PHP extensions

.env.blueprint

@@ -14,7 +14,7 @@ ENV=local
 # | Docker Sync
 # |--------------------------------------------------------------------------
 # |
-# | Enable Docker Sync to fix performance issues on Mac and Windows.
+# | If true, enable Docker Sync to fix performance issues on Mac and Windows.
 # |
 # | It requires Docker Sync to be installed on your host.
 # | See http://docker-sync.io/ for more details.
@@ -47,6 +47,25 @@ TRAEFIK_LOG_LEVEL=DEBUG
 
 TRAEFIK_PASSWORD=secret
 
+# |--------------------------------------------------------------------------
+# | Graylog password
+# |--------------------------------------------------------------------------
+# |
+# | The password of the user defined in the "kickoff.yml" file.
+# |
+
+GRAYLOG_PASSWORD=secret
+
+# |--------------------------------------------------------------------------
+# | Graylog Java options
+# |--------------------------------------------------------------------------
+# |
+# | The Java options for the Graylog server and Elasticsearch.
+# |
+
+GRAYLOG_SERVER_JAVA_OPTS="-Xms1g -Xmx2g -XX:NewRatio=1 -XX:MaxMetaspaceSize=256m -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
+GRAYLOG_ES_JAVA_OPTS="-Xms256m -Xmx256m"
+
 # |--------------------------------------------------------------------------
 # | MySQL password
 # |--------------------------------------------------------------------------
@@ -60,7 +79,7 @@ MYSQL_PASSWORD=secret
 # | MySQL root password
 # |--------------------------------------------------------------------------
 # |
-# | The root password.
+# | The MySQL root password.
 # |
 
 MYSQL_ROOT_PASSWORD=admin
@@ -94,26 +113,6 @@ REDIS_PASSWORD=secret
 
 RABBITMQ_PASSWORD=secret
 
-# |--------------------------------------------------------------------------
-# | Graylog password
-# |--------------------------------------------------------------------------
-# |
-# | The password of the user defined in the "kickoff.yml" file.
-# |
-
-GRAYLOG_PASSWORD=secret
-
-# |--------------------------------------------------------------------------
-# | Graylog Java options
-# |--------------------------------------------------------------------------
-# |
-# | Java options for the Graylog server and Elasticsearch.
-# |
-
-GRAYLOG_SERVER_JAVA_OPTS="-Xms1g -Xmx2g -XX:NewRatio=1 -XX:MaxMetaspaceSize=256m -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
-GRAYLOG_ES_JAVA_OPTS="-Xms256m -Xmx256m"
-
-
 # |--------------------------------------------------------------------------
 # | PHP memory limit
 # |--------------------------------------------------------------------------
@@ -125,5 +124,4 @@ GRAYLOG_ES_JAVA_OPTS="-Xms256m -Xmx256m"
 # |
 
 TOOLBOX_PHP_MEMORY_LIMIT=-1
-PHP_FPM_MEMORY_LIMIT=128m
-
+PHP_FPM_MEMORY_LIMIT=128m

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Hi! Thank your for considering contributing to Orbit. You'll
+Hi! Thank your for considering contributing to kickoff-docker-php. You'll
 find below useful information about how to contribute to the docker-kickoff-php project.
 
 ## Contributing code