Renamed main to app container

mblaschke · mblaschke · commit d2446c9d623c · 2016-03-03T22:20:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ PHP Docker Boilerplate Changelog
 - Real production and development provisioning
 - Added cloud support (without host mounted volumes)
 - Moved `code/` to `app/` (Moved `/application/code` to `/app` inside Docker container)
+- Renamed `main` to `app` container
 
 4.1.0 - canceled
 ------------------
diff --git a/Dockerfile.cloud b/Dockerfile.cloud
@@ -1,5 +1,5 @@
 #++++++++++++++++++++++++++++++++++++++
-# Application Docker container
+# PHP application Docker container
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
diff --git a/Dockerfile.development b/Dockerfile.development
@@ -1,5 +1,5 @@
 #++++++++++++++++++++++++++++++++++++++
-# Application Docker container
+# PHP application Docker container
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
diff --git a/Dockerfile.production b/Dockerfile.production
@@ -1,5 +1,5 @@
 #++++++++++++++++++++++++++++++++++++++
-# Application Docker container
+# PHP application Docker container
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
diff --git a/Makefile b/Makefile
@@ -29,31 +29,32 @@ state:
 
 rebuild:
 	docker-compose stop
-	docker-compose rm --force main web
+	docker-compose rm --force app
 	docker-compose build --no-cache
+	docker-compose up -d
 
 #############################
 # MySQL
 #############################
 
 mysql-backup:
-	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
+	docker-compose run --rm --no-deps app root bash /docker/bin/backup.sh mysql
 
 mysql-restore:
-	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
+	docker-compose run --rm --no-deps app root bash /docker/bin/restore.sh mysql
 
 #############################
 # Solr
 #############################
 
 solr-backup:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
+	docker-compose run --rm --no-deps app root bash /docker/bin/backup.sh solr
 	docker-compose start solr
 
 solr-restore:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
+	docker-compose run --rm --no-deps app root bash /docker/bin/restore.sh solr
 	docker-compose start solr
 
 #############################
@@ -67,10 +68,10 @@ build:
 	bash bin/build.sh
 
 bash:
-	docker-compose run --rm main bash
+	docker-compose run --rm app bash
 
 root:
-	docker-compose run --rm main root
+	docker-compose run --rm app root
 
 #############################
 # Argument fix workaround
diff --git a/docker-compose.cloud.yml b/docker-compose.cloud.yml
@@ -1,5 +1,5 @@
 #######################################
-# Main php container
+# PHP application Docker container
 #
 # for this container you have to remove
 # following entries from .dockerignore:
@@ -9,7 +9,7 @@
 # app/*
 #
 #######################################
-main:
+app:
   build: .
   dockerfile: Dockerfile.cloud
   links:
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -1,7 +1,7 @@
 #######################################
-# Main php container
+# PHP application Docker container
 #######################################
-main:
+app:
   build: .
   dockerfile: Dockerfile.development
   links:
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -1,7 +1,7 @@
 #######################################
-# Main php container
+# PHP application Docker container
 #######################################
-main:
+app:
   build: .
   dockerfile: Dockerfile.production
   links:
diff --git a/documentation/CUSTOMIZE.md b/documentation/CUSTOMIZE.md
@@ -2,20 +2,19 @@
 
 # Customizing
 
-## Custom packages (`main` controller)
-
-You can add custom shell commands in `docker/main/{DISTRIBUTION}/bin/customization.sh`
+## Custom packages (`app` controller)
 
+You can add custom commands in `Dockerfile.*`
 
 ## Custom php.ini directives
 
 Modify the `etc/php/development.ini` or `etc/php/production.ini`, it will be added on top of the default php.ini so
 you can overwrite any directives.
 
-After modification rebuild your `main` container:
+After modification rebuild your `app` container:
 
 ```bash
 docker-compose stop
-docker-compose build main
+docker-compose build app
 docker-compose up -d
 ```
diff --git a/documentation/DOCKER-INFO.md b/documentation/DOCKER-INFO.md
@@ -6,7 +6,7 @@
 
 Container                 | Description
 ------------------------- | -------------------------------
-main                      | Main container with nginx/apache and PHP-FPM and tools (your entrypoint for bash, php and other stuff)
+app                       | PHP application container with nginx/apache and PHP-FPM and tools (your entrypoint for bash, php and other stuff)
 storage                   | Storage container, eg. for Solr data
 mysql                     | MySQL database
 postgres (optional)       | PostgreSQL database
@@ -17,15 +17,13 @@ redis (optional)          | Redis server
 ftps (optional)           | FTP server (vsftpd)
 mailcatcher (optional)    | Mailserver with easy web and REST interface for mailing
 
-This directory will be mounted under `/docker` in `main` and `web` container.
+The `app/` directory will be mounted under `/app` inside `app` container.
 
 ## Docker images
 Container                 | Source
 ------------------------- | -------------------------------
-main/ubuntu               | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official* (prebuilt available from https://hub.docker.com/r/webdevops/php-boilerplate/)
-main/centos               | [CentOS](https://registry.hub.docker.com/_/centos/) *official* (prebuilt available from https://hub.docker.com/r/webdevops/php-boilerplate/)
+app                       | [WebDevOps Images](https://registry.hub.docker.com/u/webdevops/)
 storage                   | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official*
-web                       | [Apache](https://registry.hub.docker.com/_/httpd/) *official* or [Nginx](https://registry.hub.docker.com/_/nginx/) *official*
 mysql                     | [MySQL](https://registry.hub.docker.com/_/mysql/) *official*
 postgres                  | [PostgreSQL](https://registry.hub.docker.com/_/postgres/) *official*
 solr (optional)           | [Solr](https://registry.hub.docker.com/u/guywithnose/solr/) from _guywithnose_
@@ -41,7 +39,7 @@ Customize the [Makefile](Makefile) for your needs.
 
 Command                   | Description
 ------------------------- | -------------------------------
-make bash                 | Enter main container with bash (user www-data)
+make bash                 | Enter main container with bash (user application)
 make root                 | Enter main container with bash (user root)
 <br>                      |
 make backup               | General backup (run all backup tasks)
diff --git a/documentation/DOCKER-QUICKSTART.md b/documentation/DOCKER-QUICKSTART.md
@@ -51,15 +51,15 @@ Logs (eg. for debugging)
 # show all logs
 docker-compose logs
 
-# ... or only php
-docker-compose logs main
+# ... or only php and webserver
+docker-compose logs app
 
-# ... or only main and mysql
-docker-compose logs main mysql
+# ... or only app and mysql
+docker-compose logs app mysql
 ```
 
 CLI script (defined in etc/environment*.yml)
 
 ```bash
-docker-compose run --rm main cli help
+docker-compose run --rm app cli help
 ```
diff --git a/documentation/PROJECT-EXISTING.md b/documentation/PROJECT-EXISTING.md
@@ -19,11 +19,11 @@ Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `etc/environment*.yml`
 
 ## Cli runner
 
-You can run one-shot command inside the `main` service container:
+You can run one-shot command inside the `app` service container:
 
 ```bash
-docker-compose run --rm main any-php-file.php argument1 argument2
-docker-compose run --rm main bash
+docker-compose run --rm app any-php-file.php argument1 argument2
+docker-compose run --rm app bash
 ```
 
 Webserver is available at Port 8000
diff --git a/documentation/PROJECT-OTHER.md b/documentation/PROJECT-OTHER.md
@@ -10,11 +10,11 @@
 
 ## Cli runner
 
-You can run one-shot command inside the `main` service container:
+You can run one-shot command inside the `app` service container:
 
 ```bash
-docker-compose run --rm main any-php-file.php argument1 argument2
-docker-compose run --rm main bash
+docker-compose run --rm app any-php-file.php argument1 argument2
+docker-compose run --rm app bash
 ```
 
 Webserver is available at Port 8000
diff --git a/documentation/PROJECT-SYMFONY.md b/documentation/PROJECT-SYMFONY.md
@@ -18,8 +18,8 @@ And change `DOCUMENT_ROOT` and `DOCUMENT_ROOT` in `etc/environment*.yml`:
 You can run one-shot command inside the `main` service container:
 
 ```bash
-docker-compose run --rm main php /app/console
-docker-compose run --rm main bash
+docker-compose run --rm app php /app/console
+docker-compose run --rm app bash
 ```
 
 Webserver is available at Port 8000
diff --git a/documentation/SERVICES.md b/documentation/SERVICES.md
@@ -2,11 +2,11 @@
 
 # Services
 
-### Main (Nginx or Apache HTTPd)
+### App (PHP with Nginx or Apache HTTPd)
 
 Setting       | Value
 ------------- | -------------
-Host          | web:80 and web:443 (ssl)
+Host          | app:80 and app:443 (ssl)
 External Port | 8000 and 8443 (ssl)
 
 ### MySQL
diff --git a/documentation/TROUBLESHOOTING.md b/documentation/TROUBLESHOOTING.md
@@ -4,13 +4,13 @@
 
 ## Startup or (docker) linking errors (safe reset)
 
-If you got any startup issues you can try to rebuild `main` containers.
+If you got any startup issues you can try to rebuild `app` containers.
 You won't lose any data with this way - it's a safe reset.
 
 ```bash
 docker-compose stop
-docker-compose rm --force main
-docker-compose build --no-cache main
+docker-compose rm --force app
+docker-compose build --no-cache app
 docker-compose up -d
 ```
 
diff --git a/documentation/UPDATE.md b/documentation/UPDATE.md
@@ -11,13 +11,23 @@ update `docker-compose.yml` and `docker-environment.yml`.
 
 For [changes see CHANGELOG.md](/CHANGELOG.md)
 
+## Upgrade to 5.0.x
+Because of a huge refactoring you need to rebuild the `app` container. The `web` container isn't used anymore.
+
+```bash
+docker-compose stop
+docker-compose rm --force app
+docker-compose build --no-cache web
+docker-compose up
+```
+
 ## Update to 3.4.x
 As `PHP_UID` was replaced with `EFFECTIVE_UID` and `PHP_GID` was replaced with `EFFECTIVE_GID` you
 have to rebuild all containers with this variables: `main` and `web`
 
 ```bash
 docker-compose stop
-docker-compose rm --force main web
-docker-compose build --no-cache main web
+docker-compose rm --force app
+docker-compose build --no-cache web
 docker-compose up
 ```
diff --git a/provision/roles/boilerplate-main/tasks/bootstrap/services.yml b/provision/roles/boilerplate-main/tasks/bootstrap/services.yml
@@ -1,11 +1,11 @@
 ---
 
 - name: Enable services
-  command: /opt/docker/bin/control.sh service.enable {{ item.service }}
-  with_items: PROVISION.service
+  command: "/opt/docker/bin/control.sh service.enable {{ item.service }}"
+  with_items: "{{ PROVISION.service }}"
   when: PROVISION.service is defined and item.status == 'enabled'
 
 - name: Disable services
-  command: /opt/docker/bin/control.sh service.disable {{ item.service }}
-  with_items: PROVISION.service
+  command: "/opt/docker/bin/control.sh service.disable {{ item.service }}"
+  with_items: "{{ PROVISION.service }}"
   when: PROVISION.service is defined and item.status == 'disabled'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#++++++++++++++++++++++++++++++++++++++`
`2`		`-# Application Docker container`
	`2`	`+# PHP application Docker container`
`3`	`3`	`#++++++++++++++++++++++++++++++++++++++`
`4`	`4`	`#`
`5`	`5`	`# PHP-Versions:`