V2.3.0 (#48)

* removing build step as PHP-FPM use an image + updating its .gitignore * updating modules versions * updating README.md + removing .app.env & app.yml
thecodingmachine · Nov 20, 2017 · c5cdef6 · c5cdef6
1 parent 73adb92
commit c5cdef6
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 <h3 align="center">kickoff-docker-php</h3>
 <p align="center">A complete stack for your PHP project powered by Docker</p>
 <p align="center">
-    <a href="https://github.com/thecodingmachine/kickoff-docker-php/tree/v2.2.0"><img src="https://img.shields.io/badge/stable-v2.2.0-green.svg" alt="Stable release: v2.2.0"></a>
+    <a href="https://github.com/thecodingmachine/kickoff-docker-php/tree/v2.3.0"><img src="https://img.shields.io/badge/stable-v2.3.0-green.svg" alt="Stable release: v2.3.0"></a>
     <a href="https://github.com/thecodingmachine/kickoff-docker-php/tree/master"><img src="https://img.shields.io/badge/unstable-master-orange.svg" alt="Unstable release: master"></a>
     <a href="https://travis-ci.org/thecodingmachine/kickoff-docker-php"><img src="https://img.shields.io/travis/thecodingmachine/kickoff-docker-php.svg?label=Travis+CI" alt="Travis CI"></a>
 </p>
@@ -123,20 +123,30 @@ and check if everything is OK!
 
 ## Orbit commands
 
+**Note:** You can use the `-d` flag to have a more detailed output.
+
+### Main commands
+
 | Command                | Description                                                                                                                                              |
 |------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `orbit run`            | Displays available Orbit commands.                                                                                                                       |
 | `orbit run kickoff`    | Generates all configuration files, builds the NGINX and PHP-FPM images and starts the containers. It's a combo of `build`, `proxy-up` and `up` commands. |
 | `orbit run shutdown`   | Stops all containers. It's a combo of  `down` and `proxy-down` commands.                                                                                 |
+| `orbit run workspace`  | Connects through ash to the PHP-FPM container. This is where you're able to run useful commands like `composer` and `yarn`.                              |
+| `orbit run mysql-cli`  | Opens the MySQL cli as `root`. On environments <> `local`, it will ask you the MySQL `root` password.                                                    |
+
+### Others commands
+
+**Note:** you should not use them, unless you know what you're doing!
+
+| Command                | Description                                                                                                                                              |
+|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `orbit run build`      | Generates all configuration files and builds the NGINX and PHP-FPM images.                                                                               |
 | `orbit run proxy-up`   | Starts the Traefik container.                                                                                                                            |
 | `orbit run up`         | Starts all containers without the Traefik container.                                                                                                     |
 | `orbit run proxy-down` | Stops the Traefik container.                                                                                                                             |
 | `orbit run down`       | Stops all containers without the Traefik container.                                                                                                      |
-| `orbit run workspace`  | Connects through ash to the PHP-FPM container. This is where you're able to run useful commands like `composer` and `yarn`.                              |
-| `orbit run mysql-cli`  | Opens the MySQL cli as `root`. On environments <> `local`, it will ask you the MySQL `root` password.                                                    |
 
-**Note:** You can use the `-d` flag to have a more detailed output.
 
 ## Project structure
 
@@ -163,9 +173,7 @@ caution: it will delete all your data.
 |----------------------|--------------------------------------------------------------------------------------|
 | `config/project.yml` | Your project configuration values.                                                   |
 | `config/modules.yml` | The cross-environments configuration values of your modules.                         |
-| `config/app.yml`     | The cross-environments configuration values of your PHP application.                 |
 | `config/.env`        | The sensitive and environment specific configuration values of your modules.         |
-| `config/.app.env`    | The sensitive and environment specific configuration values of your PHP application. |
 | `orbit.yml`          | The Orbit's commands of your project.                                                |
 
 Don't hesitate to take a look at those files, as they are provided with nice comments!

diff --git a/config/.app.env.blueprint b/config/.app.env.blueprint
diff --git a/config/.env.blueprint b/config/.env.blueprint
@@ -11,14 +11,12 @@
 ENV=local
 
 # |--------------------------------------------------------------------------
-# | Application directory
+# | Application directory name
 # |--------------------------------------------------------------------------
 # |
-# | Application directory
+# | The PHP application directory name.
 # |
-# | If your PHP application source is in other directory than 'app'.
-# | Change the value below.
-# | No trailing slash, relative to kickoff-docker root.
+# | Caution: it's not a path.
 # |
 
 DIR=app

diff --git a/config/.gitignore b/config/.gitignore
@@ -1,2 +1 @@
-.app.env
 .env
diff --git a/config/app.yml b/config/app.yml
diff --git a/config/orbit/orbit-build.yml b/config/orbit/orbit-build.yml
@@ -86,7 +86,6 @@ commands:
       - orbit generate -t modules/php-fpm/conf.d/memory-limit.blueprint.ini -o modules/php-fpm/conf.d/memory-limit.ini -e Config,config/.env {{ if debug }}-d{{ end }}
       - orbit generate -t modules/php-fpm/php-fpm.d/memory-limit.blueprint.conf -o modules/php-fpm/php-fpm.d/memory-limit.conf -e Config,config/.env {{ if debug }}-d{{ end }}
       - orbit generate -t modules/php-fpm/php-fpm.d/security.blueprint.conf -o modules/php-fpm/php-fpm.d/security.conf -e Config,config/.env {{ if debug }}-d{{ end }}
-      - docker-compose -p {{ .EnvFiles.Config.ENV }}{{ .Values.Project.name }} -f modules/php-fpm/docker-compose.yml build
 
   # |--------------------------------------------------------------------------
   # | orbit run nginx-build

diff --git a/modules/graylog/docker-compose.blueprint.yml b/modules/graylog/docker-compose.blueprint.yml
@@ -6,7 +6,7 @@ services:
 
 
   graylog-mongo:
-    image: mongo:3.4.9
+    image: mongo:3.4.10
     container_name: {{ .EnvFiles.Config.ENV }}-{{ .Values.Project.name }}-graylog-mongo
     restart: "no"
     networks:

diff --git a/modules/mysql/docker-compose.blueprint.yml b/modules/mysql/docker-compose.blueprint.yml
@@ -36,7 +36,7 @@ services:
     {{ end }}
   {{ if eq "local" .EnvFiles.Config.ENV }}
   phpmyadmin:
-    image: phpmyadmin/phpmyadmin:4.7.4-1
+    image: phpmyadmin/phpmyadmin:4.7.5-1
     container_name: {{ .EnvFiles.Config.ENV }}-{{ .Values.Project.name }}-phpmyadmin
     restart: "no"
     networks:

diff --git a/modules/nginx/Dockerfile b/modules/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.12.1-alpine
+FROM nginx:1.12.2-alpine
 
 # |--------------------------------------------------------------------------
 # | Permissions issues workaround

diff --git a/modules/php-fpm/.gitignore b/modules/php-fpm/.gitignore
@@ -1,5 +1,4 @@
 conf.d/memory-limit.ini
 php-fpm.d/memory-limit.conf
 php-fpm.d/security.conf
-docker-compose.yml
-Dockerfile
+docker-compose.yml
diff --git a/modules/php-fpm/docker-compose.blueprint.yml b/modules/php-fpm/docker-compose.blueprint.yml
@@ -5,7 +5,7 @@ services:
 
 
   php-fpm:
-    image: gulnap/kickoff-docker-php-images:php-fpm-7.1.10-v2.2.0
+    image: gulnap/kickoff-docker-php-images:php-fpm-7.1.11-v2.3.0
     container_name: {{ .EnvFiles.Config.ENV }}-{{ .Values.Project.name }}-php-fpm
     restart: {{ if and (ne "local" .EnvFiles.Config.ENV) (eq false .Values.Modules.graylog.enable) }}unless-stopped{{ else }}"no"{{ end }}
     entrypoint: /usr/local/bin/docker-entrypoint.sh

diff --git a/modules/rabbitmq/docker-compose.blueprint.yml b/modules/rabbitmq/docker-compose.blueprint.yml
@@ -6,7 +6,7 @@ services:
 
 
   rabbitmq:
-    image: rabbitmq:3.6.12-management-alpine
+    image: rabbitmq:3.6.14-management-alpine
     container_name: {{ .EnvFiles.Config.ENV }}-{{ .Values.Project.name }}-rabbitmq
     restart: {{ if and (ne "local" .EnvFiles.Config.ENV) (eq false .Values.Modules.graylog.enable) }}unless-stopped{{ else }}"no"{{ end }}
     hostname: rabbitmq