Skip to content

Commit 40d4d57

Browse files
mblaschkemblaschke
committed
Refactored main container (overall provisioning)
1 parent ec5a3f8 commit 40d4d57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+44
-551
lines changed

‎docker-compose.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ main:
88
dockerfile: Ubuntu-14.04 # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
99
#dockerfile: Ubuntu-15.04 # Ubuntu 15.04 - PHP 5.6 (vivid)
1010
#dockerfile: Ubuntu-15.10 # Ubuntu 15.10 - PHP 5.6 (wily)
11-
12-
## CentOS
13-
#build: docker/main/centos
14-
#dockerfile: docker/main/centos/Centos-7 # CentOS 7 - PHP 5.4
15-
#dockerfile: docker/main/ubuntu-hhvm # ubuntu lts with HHVM (ansible provisioning)
11+
#dockerfile: Ubuntu-HHVM # Ubuntu 14.04 - HHVM (trusty)
12+
#dockerfile: Centos-7 # CentOS 7 - PHP 5.4
1613
links:
1714
- mysql
1815
#- postgres

‎docker/main/ubuntu-hhvm/bin/bootstrap.sh‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎docker/main/ubuntu-hhvm/bin/customization.sh‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docker/main/ubuntu-hhvm/bin/dnsmasq.sh‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎docker/main/ubuntu-hhvm/bin/logwatch.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎docker/main/ubuntu-hhvm/bin/provision.sh‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎docker/main/ubuntu-hhvm/htdocs/.gitkeep‎

Whitespace-only changes.

‎docker/main/ubuntu-hhvm/provision/ansible.cfg‎

Whitespace-only changes.

‎docker/main/ubuntu-hhvm/provision/inventory‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docker/main/ubuntu-hhvm/provision/playbook.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)