v2.0.0 Release Candidate 1 (#29)

Author: Julien Neuhart

.docker/.bin/usermod.sh .docker/.bin/linux-fix-permissions.sh.docker/.bin/usermod.sh renamed to .docker/.bin/linux-fix-permissions.sh

@@ -9,10 +9,7 @@ sedi()
 }
 
 # permissions issues workaround for Linux
-if [ "$1" == "toolbox" ]; then
-    sedi "s/\${UID}/$(id -u)/g" ${ROOT}/.docker/docker-compose-toolbox.yml;
-else
-    sedi "s/\${UID}/$(id -u)/g" ${ROOT}/.docker/docker-compose.yml;
-fi;
+sedi "s/\${UID}/$(id -u)/g" ${ROOT}/.docker/docker-compose.yml;
+sedi "s/\${GID}/$(id -g)/g" ${ROOT}/.docker/docker-compose.yml;
 
 exit 0;

.docker/.misc/rkt.txt

@@ -20,4 +20,4 @@
      .'    / (_  )
       _. :(.   )8P  `
 
- {{ .Values.Rkt.success }}
+ Your project has been successfully launched!

.docker/.misc/rkt.yml

@@ -16,24 +16,12 @@ commands:
   # | orbit run toolbox-build
   # |--------------------------------------------------------------------------
   # |
-  # | Generates the Toolbox container configuration files and builds it.
-  # |
-  # | If ENABLE_DOCKER_SYNC=true, also generates the Docker Sync configuration
-  # | file.
+  # | Generates the Toolbox container configuration files.
   # |
 
   - use: "toolbox-build"
     run:
-      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - orbit generate -t=docker-sync.blueprint.yml -o=docker-sync.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
-      {{- end }}
-      - orbit generate -t=.docker/toolbox/Dockerfile.blueprint -o=.docker/toolbox/Dockerfile -v=Kickoff,kickoff.yml -e=Kickoff,.env
-      - orbit generate -t=.docker/toolbox/conf.d/memory-limit.blueprint.ini -o=.docker/toolbox/conf.d/memory-limit.ini -v=Kickoff,kickoff.yml -e=Kickoff,.env
       - orbit generate -t=.docker/docker-compose-toolbox.blueprint.yml -o=.docker/docker-compose-toolbox.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
-      {{- if eq "linux" .Os }}
-      - /bin/bash .docker/.bin/usermod.sh toolbox
-      {{- end }}
-      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml build
 
   # |--------------------------------------------------------------------------
   # | orbit run proxy-build
@@ -65,18 +53,28 @@ commands:
   # | Generates the configuration files of your services and builds the NGINX
   # | and PHP-FPM containers.
   # |
+  # | If ENABLE_DOCKER_SYNC=true, also generates the Docker Sync configuration
+  # | file.
+  # |
 
   - use: "build"
     run:
+      # Docker Sync
+      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
+      - orbit generate -t=docker-sync.blueprint.yml -o=docker-sync.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
+      {{- end }}
+      # MySQL
       - orbit generate -t=.docker/mysql/.secrets/mysql_password.blueprint.txt -o=.docker/mysql/.secrets/mysql_password.txt -e=Kickoff,.env
       - orbit generate -t=.docker/mysql/.secrets/mysql_root_password.blueprint.txt -o=.docker/mysql/.secrets/mysql_root_password.txt -e=Kickoff,.env
       - orbit generate -t=.docker/mysql/docker-entrypoint-initdb.d/databases.blueprint.sql -o=.docker/mysql/docker-entrypoint-initdb.d/databases.sql -v=Kickoff,kickoff.yml
+      # PHP-FPM
       - orbit generate -t=.docker/php-fpm/conf.d/memory-limit.blueprint.ini -o=.docker/php-fpm/conf.d/memory-limit.ini -e=Kickoff,.env
       - orbit generate -t=.docker/php-fpm/php-fpm.d/memory-limit.blueprint.conf -o=.docker/php-fpm/php-fpm.d/memory-limit.conf -e=Kickoff,.env
       - orbit generate -t=.docker/php-fpm/php-fpm.d/security.blueprint.conf -o=.docker/php-fpm/php-fpm.d/security.conf -e=Kickoff,.env
       - orbit generate -t=.docker/php-fpm/Dockerfile.blueprint -o=.docker/php-fpm/Dockerfile -e=Kickoff,.env
+      # Docker
       - orbit generate -t=.docker/docker-compose.blueprint.yml -o=.docker/docker-compose.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env
       {{- if eq "linux" .Os }}
-      - /bin/bash .docker/.bin/usermod.sh
+      - /bin/bash .docker/.bin/linux-fix-permissions.sh
       {{- end }}
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose.yml build

.docker/.orbit/orbit-build.yml

@@ -11,15 +11,15 @@
 commands:
 
   # |--------------------------------------------------------------------------
-  # | orbit run toolbox-ash
+  # | orbit run workspace
   # |--------------------------------------------------------------------------
   # |
-  # | Connects through ash to the Toolbox container.
+  # | Connects through ash to the PHP-FPM container.
   # |
 
-  - use: "toolbox-ash"
+  - use: "workspace"
     run:
-      - docker exec --user www-data -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox ash
+      - docker exec --user www-data -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-php-fpm ash
 
   # |--------------------------------------------------------------------------
   # | orbit run traefik-self-signed-certificate
@@ -31,7 +31,7 @@ commands:
   - use: "traefik-self-signed-certificate"
     run:
     {{- if eq "local" .EnvFiles.Kickoff.ENV }}
-      - docker exec --user root -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox /bin/sh -c /scripts/traefik-self-signed-certificate.sh
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml run toolbox /bin/sh -c /scripts/traefik-self-signed-certificate.sh
     {{- else if eq .Os "windows" }}
       - cmd.exe /c echo Skipping self-signed certificate generation ...
     {{- else }}
@@ -51,7 +51,7 @@ commands:
   - use: "traefik-htdigest"
     run:
     {{- if ne "local" .EnvFiles.Kickoff.ENV }}
-      - docker exec --user root -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox /bin/sh -c /scripts/traefik-htdigest.sh
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml run toolbox /bin/sh -c /scripts/traefik-htdigest.sh
     {{- else if eq .Os "windows" }}
       - cmd.exe /c echo Skipping .htdigest file generation ...
     {{- else }}
@@ -67,18 +67,18 @@ commands:
 
   - use: "graylog-health-check"
     run:
-      - docker exec --user root -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox /bin/sh -c /scripts/graylog-health-check.sh
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml run toolbox /bin/sh -c /scripts/graylog-health-check.sh
 
   # |--------------------------------------------------------------------------
-  # | orbit run graylog-passwords
+  # | orbit run graylog-secrets
   # |--------------------------------------------------------------------------
   # |
-  # | Generates Graylog passwords.
+  # | Generates Graylog secrets.
   # |
 
-  - use: "graylog-passwords"
+  - use: "graylog-secrets"
     run:
-      - docker exec --user root -ti {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox /bin/sh -c /scripts/graylog-passwords.sh
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml run toolbox /bin/sh -c /scripts/graylog-secrets.sh
 
   # |--------------------------------------------------------------------------
   # | orbit run mysql-cli

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

@@ -5,36 +5,20 @@
 # | This file describes the down commands of your project.
 # | Feel free to add your own commands!
 # |
-# | Down order: down graylog-down proxy-down toolbox-down
+# | Down order: down graylog-down proxy-down
 # |
 # | https://github.com/gulien/orbit/
 # |
 
 commands:
 
-  # |--------------------------------------------------------------------------
-  # | orbit run toolbox-down
-  # |--------------------------------------------------------------------------
-  # |
-  # | Stops the Toolbox container.
-  # |
-  # | It should be the last to stop.
-  # |
-
-  - use: "toolbox-down"
-    run:
-      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml down
-      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - docker-sync clean -c=docker-sync.yml
-      {{- end }}
-
   # |--------------------------------------------------------------------------
   # | orbit run proxy-down
   # |--------------------------------------------------------------------------
   # |
   # | Stops the Traefik container.
   # |
-  # | It should be stop just before the Toolbox container.
+  # | It should be the last to stop.
   # |
 
   - use: "proxy-down"
@@ -47,7 +31,7 @@ commands:
   # |
   # | Stops the Graylog containers.
   # |
-  # | They should be stop just before the Traefik container.
+  # | They should be stop before the Traefik container.
   # |
 
   - use: "graylog-down"
@@ -60,11 +44,16 @@ commands:
   # |
   # | Stops the NGINX, PHP-FPM, MySQL, Redis and RabbitMQ containers.
   # |
+  # | If ENABLE_DOCKER_SYNC=true, stops Docker Sync
+  # |
   # | On "local" environment, also stops the phpMyAdmin container.
   # |
   # | They should be the first to stop.
   # |
 
   - use: "down"
     run:
-      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose.yml down
+      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose.yml down
+      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
+      - docker-sync clean -c=docker-sync.yml
+      {{- end }}

.docker/.orbit/orbit-down.yml

@@ -19,4 +19,4 @@ commands:
 
   - use: "rkt"
     run:
-      - orbit generate -t=.docker/.misc/rkt.txt -v=Rkt,.docker/.misc/rkt.yml
+      - orbit generate -t=.docker/.misc/rkt.txt

.docker/.orbit/orbit-misc.yml

@@ -5,57 +5,43 @@
 # | This file describes the up commands of your project.
 # | Feel free to add your own commands!
 # |
-# | Up order: toolbox-up proxy-up graylog-up up
+# | Up order: proxy-up graylog-up up
 # |
 # | https://github.com/gulien/orbit/
 # |
 
 commands:
 
   # |--------------------------------------------------------------------------
-  # | orbit run toolbox-up
+  # | orbit run proxy-up
   # |--------------------------------------------------------------------------
   # |
-  # | Starts the Toolbox container.
+  # | Starts the Traefik container and calls the Toolbox container to generate
+  # | the self-signed certificate on your "local" environment or the .htdigest
+  # | file in others environments.
   # |
   # | It should be the first to start.
   # |
 
-  - use: "toolbox-up"
+  - use: "proxy-up"
     run:
-      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - docker-sync start -c=docker-sync.yml
-      {{- end }}
-      - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-toolbox.yml up -d
       - orbit run traefik-self-signed-certificate -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
       - orbit run traefik-htdigest -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
-      - orbit run graylog-passwords -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
-
-
-  # |--------------------------------------------------------------------------
-  # | orbit run proxy-up
-  # |--------------------------------------------------------------------------
-  # |
-  # | Starts the Traefik container.
-  # |
-  # | It should be start after the Toolbox container.
-  # |
-
-  - use: "proxy-up"
-    run:
       - docker-compose -p kickoff -f .docker/docker-compose-proxy.yml up -d
 
   # |--------------------------------------------------------------------------
   # | orbit run graylog-up
   # |--------------------------------------------------------------------------
   # |
-  # | Starts the Graylog containers.
+  # | Starts the Graylog containers and calls the Toolbox container to generate
+  # | the Graylog secrets.
   # |
   # | They should be start after the Traefik container.
   # |
 
   - use: "graylog-up"
     run:
+      - orbit run graylog-secrets -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose-graylog.yml up -d
 
   # |--------------------------------------------------------------------------
@@ -64,6 +50,8 @@ commands:
   # |
   # | Starts the NGINX, PHP-FPM, MySQL, Redis and RabbitMQ containers.
   # |
+  # | If ENABLE_DOCKER_SYNC=true, starts Docker Sync.
+  # |
   # | On "local" environment, also starts the phpMyAdmin container.
   # |
   # | They should be the last to start.
@@ -72,4 +60,7 @@ commands:
   - use: "up"
     run:
       - orbit run graylog-health-check -c=.docker/.orbit/orbit-docker-commands.yml -v=Kickoff,kickoff.yml -e=Kickoff,.env -s
+      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
+      - docker-sync start -c=docker-sync.yml
+      {{- end }}
       - docker-compose -p {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }} -f .docker/docker-compose.yml up -d

.docker/.orbit/orbit-up.yml

@@ -26,6 +26,13 @@ services:
       - ./traefik/traefik.toml:/traefik.toml:ro
       {{- if eq "local" .EnvFiles.Kickoff.ENV }}
       - ./toolbox/generated/traefik/certs:/tests:ro
+      {{- else }}
+      {{- range $env, $virtualhost := .Values.Kickoff.project.virtualhost }}
+      {{- if eq $env $.EnvFiles.Kickoff.ENV }}
+      - {{ $.EnvFiles.Kickoff.TRAEFIK_CERT_FILE_PATH }}:/certs/{{ $virtualhost }}.crt:ro
+      - {{ $.EnvFiles.Kickoff.TRAEFIK_KEY_FILE_PATH }}:/certs/{{ $virtualhost }}.key:ro
+      {{- end }}
+      {{- end }}
       {{- end }}
       {{- if ne "local" .EnvFiles.Kickoff.ENV }}
       - ./toolbox/generated/traefik/auth/:/auth/:ro

.docker/docker-compose-proxy.blueprint.yml

@@ -5,14 +5,9 @@ services:
 
 
   toolbox:
-    build:
-      context: ./toolbox
-      args:
-        - UID={{ if eq "linux" .Os }}${UID}{{ else }}1000{{ end }}
+    image: gulnap/kickoff-docker-php-images:toolbox-3.6-rc1
     container_name: {{ .EnvFiles.Kickoff.ENV }}-{{ .Values.Kickoff.project.name }}-toolbox
-    restart: {{ if ne "local" .EnvFiles.Kickoff.ENV }}unless-stopped{{ else }}"no"{{ end }}
-    tty: true
-    working_dir: /var/www/html
+    restart: "no"
     networks:
       - backend
     environment:
@@ -29,12 +24,6 @@ services:
     labels:
       - traefik.enable=false
     volumes:
-      {{- if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-      - {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:/var/www/html:nocopy
-      {{- else }}
-      - ../app:/var/www/html:{{ if eq "darwin" .Os }}cached{{ else }}rw{{ end }}
-      {{- end }}
-      - ./toolbox/conf.d/memory-limit.ini:/usr/local/etc/php/conf.d/memory-limit.ini:ro
       - ./toolbox/generated:/generated:rw
       - ./toolbox/scripts:/scripts:ro
 
@@ -43,12 +32,4 @@ networks:
 
 
   backend:
-    driver: bridge
-
-{{ if eq "true" .EnvFiles.Kickoff.ENABLE_DOCKER_SYNC }}
-volumes:
-
-
-  {{ .EnvFiles.Kickoff.ENV }}{{ .Values.Kickoff.project.name }}_sync_app:
-    external: true
-{{- end }}
+    driver: bridge