Commit 3c79c28

authored

[WIP] Feature/cleanup provision (#45)

* Cleanup provision files Remove old and deprecated stuff Also fixes hhvm support * Remove blackfire * Revert "Remove blackfire" This reverts commit 9afb7a1. * Add switch for xdebug and blackfire * Add support for preinstalled blackfire Needs updated images * Add vhosts and mailcatcher to development * Switch php debugger to environment variable * Raise docker-compose.yml to version 2 * Switch to ubuntu 16.04 as default Using PHP 7 now as default * Fix logo text * Add Postgres 9.5 * switches Postgres Dockerfiles to a ".Dockerfile" file extension to have better editor support # Conflicts: # docker-compose.cloud.yml # docker-compose.development.yml # docker-compose.production.yml # etc/application.environment.yml * Update mysql docker Add .Dockerfile prefix Add Percona 5.7 * Remove unused badges

1 parent 007a47f commit 3c79c28Copy full SHA for 3c79c28

File tree

35 files changed

+487

-583

lines changed

Dockerfile.cloud
Dockerfile.development
Dockerfile.production
README.md
docker-compose.cloud.yml
docker-compose.development.yml
docker-compose.production.yml
docker
etc
provision/roles
- boilerplate-main-development/tasks
  - bootstrap.yml
  - bootstrap/php-blackfire
    - debian.yml
    - redhat.yml
- boilerplate-main/tasks
  - bootstrap.yml
  - bootstrap
  - entrypoint.yml
  - entrypoint
    - mysql.yml
    - php.yml
  - main.yml

35 files changed

+487

-583

lines changed

`‎Dockerfile.cloud‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`#`
`44`	`44`	`#++++++++++++++++++++++++++++++++++++++`
`45`	`45`
`46`		`-FROM webdevops/php-apache:ubuntu-14.04`
	`46`	`+FROM webdevops/php-apache:ubuntu-16.04`
`47`	`47`
`48`	`48`	`ENV PROVISION_CONTEXT "production"`
`49`	`49`
`@@ -53,7 +53,7 @@ COPY provision/ /opt/docker/provision/`
`53`	`53`
`54`	`54`	`COPY app/ /app/`
`55`	`55`
`56`		`-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \`
	`56`	`+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \`
`57`	`57`	`&& /opt/docker/bin/bootstrap.sh`
`58`	`58`
`59`	`59`	`# Configure volume/workdir`

`‎Dockerfile.development‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@`
`43`	`43`	`#`
`44`	`44`	`#++++++++++++++++++++++++++++++++++++++`
`45`	`45`
`46`		`-FROM webdevops/php-apache-dev:ubuntu-14.04`
	`46`	`+FROM webdevops/php-apache-dev:ubuntu-16.04`
`47`	`47`
`48`	`48`	`ENV PROVISION_CONTEXT "development"`
`49`	`49`
`50`	`50`	`# Deploy scripts/configurations`
`51`	`51`	`COPY etc/ /opt/docker/etc/`
`52`	`52`	`COPY provision/ /opt/docker/provision/`
`53`	`53`
`54`		`-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-main-development boilerplate-deployment \`
	`54`	`+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-main-development --role boilerplate-deployment \`
`55`	`55`	`&& /opt/docker/bin/bootstrap.sh`
`56`	`56`
`57`	`57`	`# Configure volume/workdir`

`‎Dockerfile.production‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@`
`43`	`43`	`#`
`44`	`44`	`#++++++++++++++++++++++++++++++++++++++`
`45`	`45`
`46`		`-FROM webdevops/php-apache:ubuntu-14.04`
	`46`	`+FROM webdevops/php-apache:ubuntu-16.04`
`47`	`47`
`48`	`48`	`ENV PROVISION_CONTEXT "production"`
`49`	`49`
`50`	`50`	`# Deploy scripts/configurations`
`51`	`51`	`COPY etc/ /opt/docker/etc/`
`52`	`52`	`COPY provision/ /opt/docker/provision/`
`53`	`53`
`54`		`-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \`
	`54`	`+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \`
`55`	`55`	`&& /opt/docker/bin/bootstrap.sh`
`56`	`56`
`57`	`57`	`# Configure volume/workdir`

`‎README.md‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-![TYPO3 Docker Boilerplate](https://static.webdevops.io/php-docker-boilerplate.svg)`
	`1`	`+![PHP Docker Boilerplate](https://static.webdevops.io/php-docker-boilerplate.svg)`
`2`	`2`
`3`	`3`	`[![latest v5.1.3](https://img.shields.io/badge/latest-v5.1.3-green.svg?style=flat)](https://github.com/webdevops/php-docker-boilerplate/releases/tag/5.1.3)`
`4`	`4`	`![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)`
`5`		`-[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Average time to resolve an issue")`
`6`		`-[![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/php-docker-boilerplate.svg)](http://isitmaintained.com/project/mblaschke/php-docker-boilerplate "Percentage of issues still open")`
`7`	`5`
`8`	`6`	`This is an easy customizable docker boilerplate for any PHP-based projects like _Symfony Framework_, _CakePHP_, _Yii_ and many other frameworks or applications.`
`9`	`7`

`‎docker-compose.cloud.yml‎`

Lines changed: 133 additions & 128 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,136 +1,141 @@`
`1`		`-#######################################`
`2`		`-# PHP application Docker container`
`3`		`-#`
`4`		`-# for this container you have to remove`
`5`		`-# following entries from .dockerignore:`
`6`		`-#`
`7`		`-# etc/*`
`8`		`-# provision/*`
`9`		`-# app/*`
`10`		`-#`
`11`		`-#######################################`
`12`		`-app:`
`13`		`- build: .`
`14`		`- dockerfile: Dockerfile.cloud`
`15`		`- links:`
`16`		`- - mysql`
`17`		`- #- postgres`
`18`		`- #- mail`
`19`		`- #- solr`
`20`		`- #- elasticsearch`
`21`		`- #- redis`
`22`		`- #- memcached`
`23`		`- #- ftp`
`24`		`- ports:`
`25`		`- - "8000:80"`
`26`		`- - "8443:443"`
`27`		`- - "10022:22"`
`28`		`- volumes_from:`
`29`		`- - storage`
`30`		`- env_file:`
`31`		`- - etc/environment.yml`
`32`		`- - etc/environment.production.yml`
	`1`	`+version: '2'`
	`2`	`+services:`
	`3`	`+ #######################################`
	`4`	`+ # PHP application Docker container`
	`5`	`+ #`
	`6`	`+ # for this container you have to remove`
	`7`	`+ # following entries from .dockerignore:`
	`8`	`+ #`
	`9`	`+ # etc/*`
	`10`	`+ # provision/*`
	`11`	`+ # app/*`
	`12`	`+ #`
	`13`	`+ #######################################`
	`14`	`+ app:`
	`15`	`+ build:`
	`16`	`+ context: .`
	`17`	`+ dockerfile: Dockerfile.cloud`
	`18`	`+ links:`
	`19`	`+ - mysql`
	`20`	`+ #- postgres`
	`21`	`+ #- mail`
	`22`	`+ #- solr`
	`23`	`+ #- elasticsearch`
	`24`	`+ #- redis`
	`25`	`+ #- memcached`
	`26`	`+ #- ftp`
	`27`	`+ ports:`
	`28`	`+ - "8000:80"`
	`29`	`+ - "8443:443"`
	`30`	`+ - "10022:22"`
	`31`	`+ volumes_from:`
	`32`	`+ - storage`
	`33`	`+ env_file:`
	`34`	`+ - etc/environment.yml`
	`35`	`+ - etc/environment.production.yml`
`33`	`36`
`34`		`-#######################################`
`35`		`-# MySQL server`
`36`		`-#######################################`
`37`		`-mysql:`
`38`		`- build: docker/mysql`
`39`		`- #dockerfile: MySQL-5.5`
`40`		`- dockerfile: MySQL-5.6`
`41`		`- #dockerfile: MySQL-5.7`
`42`		`- #dockerfile: MariaDB-5.5`
`43`		`- #dockerfile: MariaDB-10`
`44`		`- #dockerfile: Percona-5.5`
`45`		`- #dockerfile: Percona-5.6`
`46`		`- volumes_from:`
`47`		`- - storage`
`48`		`- env_file:`
`49`		`- - etc/environment.yml`
`50`		`- - etc/environment.production.yml`
	`37`	`+ #######################################`
	`38`	`+ # MySQL server`
	`39`	`+ #######################################`
	`40`	`+ mysql:`
	`41`	`+ build:`
	`42`	`+ context: docker/mysql/`
	`43`	`+ #dockerfile: MySQL-5.5.Dockerfile`
	`44`	`+ dockerfile: MySQL-5.6.Dockerfile`
	`45`	`+ #dockerfile: MySQL-5.7.Dockerfile`
	`46`	`+ #dockerfile: MariaDB-5.5.Dockerfile`
	`47`	`+ #dockerfile: MariaDB-10.Dockerfile`
	`48`	`+ #dockerfile: Percona-5.5.Dockerfile`
	`49`	`+ #dockerfile: Percona-5.6.Dockerfile`
	`50`	`+ #dockerfile: Percona-5.7.Dockerfile`
	`51`	`+ volumes_from:`
	`52`	`+ - storage`
	`53`	`+ env_file:`
	`54`	`+ - etc/environment.yml`
	`55`	`+ - etc/environment.production.yml`
`51`	`56`
`52`		`-#######################################`
`53`		`-# PostgreSQL server`
`54`		`-#######################################`
`55`		`-#postgres:`
`56`		`-# build: docker/postgres/`
`57`		`-# volumes_from:`
`58`		`-# - storage`
`59`		`-# env_file:`
`60`		`-# - etc/environment.yml`
`61`		`-# - etc/environment.production.yml`
	`57`	`+ #######################################`
	`58`	`+ # PostgreSQL server`
	`59`	`+ #######################################`
	`60`	`+ #postgres:`
	`61`	`+ # build:`
	`62`	`+ # context: docker/postgres/`
	`63`	`+ # dockerfile: Postgres-9.4.Dockerfile`
	`64`	`+ # dockerfile: Postgres-9.5.Dockerfile`
	`65`	`+ # volumes_from:`
	`66`	`+ # - storage`
	`67`	`+ # env_file:`
	`68`	`+ # - etc/environment.yml`
	`69`	`+ # - etc/environment.production.yml`
`62`	`70`
`63`		`-#######################################`
`64`		`-# Solr server`
`65`		`-#######################################`
`66`		`-#solr:`
`67`		`-# build: docker/solr/`
`68`		`-# volumes_from:`
`69`		`-# - storage`
`70`		`-# environment:`
`71`		`-# - SOLR_STORAGE=/storage/solr/server-master/`
`72`		`-# env_file:`
`73`		`-# - etc/environment.yml`
`74`		`-# - etc/environment.production.yml`
	`71`	`+ #######################################`
	`72`	`+ # Solr server`
	`73`	`+ #######################################`
	`74`	`+ #solr:`
	`75`	`+ # build:`
	`76`	`+ # context: docker/solr/`
	`77`	`+ # volumes_from:`
	`78`	`+ # - storage`
	`79`	`+ # environment:`
	`80`	`+ # - SOLR_STORAGE=/storage/solr/server-master/`
	`81`	`+ # env_file:`
	`82`	`+ # - etc/environment.yml`
	`83`	`+ # - etc/environment.production.yml`
`75`	`84`
`76`		`-#######################################`
`77`		`-# Elasticsearch`
`78`		`-#######################################`
`79`		`-#elasticsearch:`
`80`		`-# build: docker/elasticsearch/`
`81`		`-# volumes_from:`
`82`		`-# - storage`
`83`		`-# env_file:`
`84`		`-# - etc/environment.yml`
`85`		`-# - etc/environment.production.yml`
	`85`	`+ #######################################`
	`86`	`+ # Elasticsearch`
	`87`	`+ #######################################`
	`88`	`+ #elasticsearch:`
	`89`	`+ # build:`
	`90`	`+ # context: docker/elasticsearch/`
	`91`	`+ # volumes_from:`
	`92`	`+ # - storage`
	`93`	`+ # env_file:`
	`94`	`+ # - etc/environment.yml`
	`95`	`+ # - etc/environment.production.yml`
`86`	`96`
`87`		`-#######################################`
`88`		`-# Redis`
`89`		`-#######################################`
`90`		`-#redis:`
`91`		`-# build: docker/redis/`
`92`		`-# volumes_from:`
`93`		`-# - storage`
`94`		`-# env_file:`
`95`		`-# - etc/environment.yml`
`96`		`-# - etc/environment.production.yml`
	`97`	`+ #######################################`
	`98`	`+ # Redis`
	`99`	`+ #######################################`
	`100`	`+ #redis:`
	`101`	`+ # build:`
	`102`	`+ # context: docker/redis/`
	`103`	`+ # volumes_from:`
	`104`	`+ # - storage`
	`105`	`+ # env_file:`
	`106`	`+ # - etc/environment.yml`
	`107`	`+ # - etc/environment.production.yml`
`97`	`108`
`98`		`-#######################################`
`99`		`-# Memcached`
`100`		`-#######################################`
`101`		`-#memcached:`
`102`		`-# build: docker/memcached/`
`103`		`-# volumes_from:`
`104`		`-# - storage`
`105`		`-# env_file:`
`106`		`-# - etc/environment.yml`
`107`		`-# - etc/environment.production.yml`
	`109`	`+ #######################################`
	`110`	`+ # Memcached`
	`111`	`+ #######################################`
	`112`	`+ #memcached:`
	`113`	`+ # build:`
	`114`	`+ # context: docker/memcached/`
	`115`	`+ # volumes_from:`
	`116`	`+ # - storage`
	`117`	`+ # env_file:`
	`118`	`+ # - etc/environment.yml`
	`119`	`+ # - etc/environment.production.yml`
`108`	`120`
`109`		`-#######################################`
`110`		`-# Mailcatcher`
`111`		`-#######################################`
`112`		`-#mail:`
`113`		`-# build: docker/mail/`
`114`		`-# env_file:`
`115`		`-# - etc/environment.yml`
`116`		`-# - etc/environment.production.yml`
	`121`	`+ #######################################`
	`122`	`+ # FTP (vsftpd)`
	`123`	`+ #######################################`
	`124`	`+ #ftp:`
	`125`	`+ # build:`
	`126`	`+ # context: docker/vsftpd/`
	`127`	`+ # volumes_from:`
	`128`	`+ # - sourcecode`
	`129`	`+ # - storage`
	`130`	`+ # env_file:`
	`131`	`+ # - etc/environment.yml`
	`132`	`+ # - etc/environment.production.yml`
`117`	`133`
`118`		`-#######################################`
`119`		`-# FTP (vsftpd)`
`120`		`-#######################################`
`121`		`-#ftp:`
`122`		`-# build: docker/vsftpd/`
`123`		`-# volumes_from:`
`124`		`-# - sourcecode`
`125`		`-# - storage`
`126`		`-# env_file:`
`127`		`-# - etc/environment.yml`
`128`		`-# - etc/environment.production.yml`
`129`		`-`
`130`		`-#######################################`
`131`		`-# Storage`
`132`		`-#######################################`
`133`		`-storage:`
`134`		`- build: docker/storage/`
`135`		`- volumes:`
`136`		`- - /storage`
	`134`	`+ #######################################`
	`135`	`+ # Storage`
	`136`	`+ #######################################`
	`137`	`+ storage:`
	`138`	`+ build:`
	`139`	`+ context: docker/storage/`
	`140`	`+ volumes:`
	`141`	`+ - /storage`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3c79c28

File tree

35 files changed

35 files changed

`‎Dockerfile.cloud‎`

`‎Dockerfile.development‎`

`‎Dockerfile.production‎`

`‎README.md‎`

`‎docker-compose.cloud.yml‎`

0 commit comments