Skip to content

Commit 0370d98

Browse files
mblaschkemblaschke
committed
Merge branch 'release/5.2.0-beta1'
2 parents 7b4ed24 + aadc560 commit 0370d98

Some content is hidden

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

47 files changed

+606
-600
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
PHP Docker Boilerplate Changelog
1+
TYPO3 Docker Boilerplate Changelog
22
==================================
33

4+
5.2.0-beta1 - 2016-10-18
5+
------------------------
6+
- Add dinghy/dory support
7+
- Switch to mailhog instead of mailcatcher
8+
- Add phpmyadmin
9+
- Switch to ubuntu 16.04 as default
10+
- docker-compose.yml is now using version 2
11+
- PHP debugger can now be switched with variable
12+
- Add PostgreSQL 9.5
13+
- Some minor fixes and cleanups
14+
415
5.1.3 - 2016-05-25
516
------------------
617
- Fix nginx vhost configuration (modular WebDevOps image design)

‎Dockerfile.cloud‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#
4444
#++++++++++++++++++++++++++++++++++++++
4545

46-
FROM webdevops/php-apache:ubuntu-14.04
46+
FROM webdevops/php-apache:ubuntu-16.04
4747

4848
ENV PROVISION_CONTEXT "production"
4949

@@ -53,7 +53,7 @@ COPY provision/ /opt/docker/provision/
5353

5454
COPY app/ /app/
5555

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 \
5757
&& /opt/docker/bin/bootstrap.sh
5858

5959
# Configure volume/workdir

‎Dockerfile.development‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
#
4444
#++++++++++++++++++++++++++++++++++++++
4545

46-
FROM webdevops/php-apache-dev:ubuntu-14.04
46+
FROM webdevops/php-apache-dev:ubuntu-16.04
4747

4848
ENV PROVISION_CONTEXT "development"
4949

5050
# Deploy scripts/configurations
5151
COPY etc/ /opt/docker/etc/
5252
COPY provision/ /opt/docker/provision/
5353

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 \
5555
&& /opt/docker/bin/bootstrap.sh
5656

5757
# Configure volume/workdir

‎Dockerfile.production‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
#
4444
#++++++++++++++++++++++++++++++++++++++
4545

46-
FROM webdevops/php-apache:ubuntu-14.04
46+
FROM webdevops/php-apache:ubuntu-16.04
4747

4848
ENV PROVISION_CONTEXT "production"
4949

5050
# Deploy scripts/configurations
5151
COPY etc/ /opt/docker/etc/
5252
COPY provision/ /opt/docker/provision/
5353

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 \
5555
&& /opt/docker/bin/bootstrap.sh
5656

5757
# Configure volume/workdir

‎README.md‎

100644100755
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
![TYPO3 Docker Boilerplate](https://static.webdevops.io/typo3-docker-boilerplate.svg)
22

3-
[![latest v5.1.3](https://img.shields.io/badge/latest-v5.1.3-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/5.1.3)
3+
[![latest v5.2.0-beta1](https://img.shields.io/badge/latest-v5.2.0-beta1-green.svg?style=flat)](https://github.com/webdevops/TYPO3-docker-boilerplate/releases/tag/5.2.0-beta1)
44
![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/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Average time to resolve an issue")
6-
[![Percentage of issues still open](http://isitmaintained.com/badge/open/webdevops/typo3-docker-boilerplate.svg)](http://isitmaintained.com/project/webdevops/typo3-docker-boilerplate "Percentage of issues still open")
75

86
This is an easy customizable TYPO3 docker boilerplate.
97

@@ -19,6 +17,7 @@ Supports:
1917
- Memcached (disabled)
2018
- Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/webdevops/vagrant-development))
2119
- FTP server (vsftpd)
20+
- PhpMyAdmin
2221
- Support for `TYPO3_CONTEXT` and `FLOW_CONTEXT` for TYPO3, FLOW, NEOS.
2322
- maybe more later...
2423

‎bin/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ sectionHeader "Checking for composer.json ..."
2020
find "$CODE_DIR" -type f -name 'composer.json' | excludeFilter | while read FILE; do
2121
COMPOSER_JSON_DIR=$(dirname $($READLINK -f "$FILE"))
2222

23-
execInDir "$COMPOSER_JSON_DIR" "composer install --no-dev --no-interaction"
23+
execInDir "$COMPOSER_JSON_DIR" "docker run --rm -v $(pwd):/app composer/composer:alpine install --no-dev --no-interaction"
2424
done
2525

2626

‎bin/create-project.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ case "$1" in
2121
## TYPO3 CMS
2222
###################################
2323
"typo3")
24-
execInDir "$CODE_DIR" "composer create-project typo3/cms-base-distribution \"$CODE_DIR\""
24+
execInDir "$CODE_DIR" "docker run --rm -v $(pwd):/app composer/composer:alpine create-project typo3/cms-base-distribution \"$CODE_DIR\""
2525
execInDir "$CODE_DIR" "touch web/FIRST_INSTALL"
2626
;;
2727

2828
###################################
2929
## TYPO3 NEOS
3030
###################################
3131
"neos")
32-
execInDir "$CODE_DIR" "composer create-project typo3/neos-base-distribution \"$CODE_DIR\""
32+
execInDir "$CODE_DIR" "docker run --rm -v $(pwd):/app composer/composer:alpine create-project typo3/neos-base-distribution \"$CODE_DIR\""
3333
;;
3434

3535
###################################

‎docker-compose.cloud.yml‎

Lines changed: 142 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,150 @@
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+
restart: always
28+
ports:
29+
- "8000:80"
30+
- "8443:443"
31+
- "10022:22"
32+
volumes_from:
33+
- storage
34+
env_file:
35+
- etc/environment.yml
36+
- etc/environment.production.yml
3337

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
38+
#######################################
39+
# MySQL server
40+
#######################################
41+
mysql:
42+
build:
43+
context: docker/mysql/
44+
#dockerfile: MySQL-5.5.Dockerfile
45+
dockerfile: MySQL-5.6.Dockerfile
46+
#dockerfile: MySQL-5.7.Dockerfile
47+
#dockerfile: MariaDB-5.5.Dockerfile
48+
#dockerfile: MariaDB-10.Dockerfile
49+
#dockerfile: Percona-5.5.Dockerfile
50+
#dockerfile: Percona-5.6.Dockerfile
51+
#dockerfile: Percona-5.7.Dockerfile
52+
restart: always
53+
volumes_from:
54+
- storage
55+
env_file:
56+
- etc/environment.yml
57+
- etc/environment.production.yml
5158

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
59+
#######################################
60+
# PostgreSQL server
61+
#######################################
62+
#postgres:
63+
# build:
64+
# context: docker/postgres/
65+
# dockerfile: Postgres-9.4.Dockerfile
66+
# dockerfile: Postgres-9.5.Dockerfile
67+
# restart: always
68+
# volumes_from:
69+
# - storage
70+
# env_file:
71+
# - etc/environment.yml
72+
# - etc/environment.production.yml
6273

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
74+
#######################################
75+
# Solr server
76+
#######################################
77+
#solr:
78+
# build:
79+
# context: docker/solr/
80+
# restart: always
81+
# volumes_from:
82+
# - storage
83+
# environment:
84+
# - SOLR_STORAGE=/storage/solr/server-master/
85+
# env_file:
86+
# - etc/environment.yml
87+
# - etc/environment.production.yml
7588

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
89+
#######################################
90+
# Elasticsearch
91+
#######################################
92+
#elasticsearch:
93+
# build:
94+
# context: docker/elasticsearch/
95+
# restart: always
96+
# volumes_from:
97+
# - storage
98+
# env_file:
99+
# - etc/environment.yml
100+
# - etc/environment.production.yml
86101

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
102+
#######################################
103+
# Redis
104+
#######################################
105+
#redis:
106+
# build:
107+
# context: docker/redis/
108+
# restart: always
109+
# volumes_from:
110+
# - storage
111+
# env_file:
112+
# - etc/environment.yml
113+
# - etc/environment.production.yml
97114

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
115+
#######################################
116+
# Memcached
117+
#######################################
118+
#memcached:
119+
# build:
120+
# context: docker/memcached/
121+
# restart: always
122+
# volumes_from:
123+
# - storage
124+
# env_file:
125+
# - etc/environment.yml
126+
# - etc/environment.production.yml
108127

109-
#######################################
110-
# Mailcatcher
111-
#######################################
112-
#mail:
113-
# build: docker/mail/
114-
# env_file:
115-
# - etc/environment.yml
116-
# - etc/environment.production.yml
128+
#######################################
129+
# FTP (vsftpd)
130+
#######################################
131+
#ftp:
132+
# build:
133+
# context: docker/vsftpd/
134+
# restart: always
135+
# volumes_from:
136+
# - sourcecode
137+
# - storage
138+
# env_file:
139+
# - etc/environment.yml
140+
# - etc/environment.production.yml
117141

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
142+
#######################################
143+
# Storage
144+
#######################################
145+
storage:
146+
build:
147+
context: docker/storage/
148+
restart: always
149+
volumes:
150+
- /storage

0 commit comments

Comments
 (0)