Skip to content

Commit 48c1e99

Browse files
committed
Improved documentation
Fixes #74 # Conflicts: # documentation/DOCKER-INFO.md
1 parent be2b238 commit 48c1e99

File tree

3 files changed

+86
-86
lines changed

3 files changed

+86
-86
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ You can use my [Vagrant Development VM](https://github.com/mblaschke/vagrant-dev
3434
- [Installation and requirements](/documentation/INSTALL.md)
3535
- [Updating docker boilerplate](/documentation/UPDATE.md)
3636
- [Customizing](/documentation/CUSTOMIZE.md)
37+
- [Services (Webserver, MySQL... Ports, Users, Passwords)](/documentation/SERVICES.md)
3738
- [Docker Quickstart](/documentation/DOCKER-QUICKSTART.md)
3839
- [Run your project](/documentation/DOCKER-STARTUP.md)
3940
- [Container detail info](/documentation/DOCKER-INFO.md)

documentation/DOCKER-INFO.md

Lines changed: 2 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ This directory will be mounted under `/docker` in `main` and `web` container.
2323
## Docker images
2424
Container | Source
2525
------------------------- | -------------------------------
26-
main/ubuntu | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official* (prebuild available from https://registry.hub.docker.com/u/mblaschke/php-boilerplate/)
27-
main/centos | [CentOS](https://registry.hub.docker.com/_/centos/) *official* (prebuild available from https://registry.hub.docker.com/u/mblaschke/php-boilerplate/)
26+
main/ubuntu | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official* (prebuilt available from https://registry.hub.docker.com/u/mblaschke/php-boilerplate/)
27+
main/centos | [CentOS](https://registry.hub.docker.com/_/centos/) *official* (prebuilt available from https://registry.hub.docker.com/u/mblaschke/php-boilerplate/)
2828
storage | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official*
2929
web | [Apache](https://registry.hub.docker.com/_/httpd/) *official* or [Nginx](https://registry.hub.docker.com/_/nginx/) *official*
3030
mysql | [MySQL](https://registry.hub.docker.com/_/mysql/) *official*
@@ -58,90 +58,6 @@ make create-cms-project | Create new TYPO3 project (based on typo3/cms-base-di
5858
make create-neos-project | Create new NEOS project (based on typo3/neos-base-distribution)
5959
<br> |
6060
make build | Run building (composer, gulp, bower)
61-
make scheduler | Run TYPO3 scheduler
62-
make clean | Clear TYPO3 configuration cache
63-
64-
## Docker containers
65-
66-
### Web (Nginx or Apache HTTPd)
67-
68-
Setting | Value
69-
------------- | -------------
70-
Host | web:80 and web:443 (ssl)
71-
External Port | 8000 and 8443 (ssl)
72-
73-
### MySQL
74-
75-
You can choose between [MySQL](https://www.mysql.com/) (default), [MariaDB](https://www.mariadb.org/)
76-
and [PerconaDB](http://www.percona.com/software) in `docker/mysql/Dockerfile`
77-
78-
Setting | Value
79-
------------- | -------------
80-
User | dev (if not changed in env)
81-
Password | dev (if not changed in env)
82-
Database | typo3 (if not changed in env)
83-
Host | mysql:3306
84-
External Port | 13306
85-
86-
Access fo MySQL user "root" and "dev" will be allowed from external hosts (eg. for debugging, dumps and other stuff).
87-
88-
89-
### PostgreSQL
90-
91-
Setting | Value
92-
------------- | -------------
93-
User | dev (if not changed in env)
94-
Password | dev (if not changed in env)
95-
Host | postgres:5432
96-
External Port | 15432
97-
98-
99-
### Solr
100-
101-
Setting | Value
102-
------------- | -------------
103-
Host | solr:8983
104-
External Port | 18983
105-
Cores | docker/solr/conf/solr.xml (data dirs are created automatically)
106-
107-
### Elasticsearch (disabled by default)
108-
109-
Setting | Value
110-
------------- | -------------
111-
Host | elasticsearch:9200 and :9300
112-
External Port | 19200 and 19300
113-
114-
### Redis
115-
116-
Setting | Value
117-
------------- | -------------
118-
Host | redis
119-
Port | 6379
120-
121-
### Memcached
122-
123-
Setting | Value
124-
------------- | -------------
125-
Host | memcached
126-
Port | 11211
127-
128-
### Mailcatcher
129-
130-
Setting | Value
131-
------------- | -------------
132-
Host | mail
133-
SMTP port | 1025
134-
Web port | 1080
135-
136-
### FTP
137-
138-
Setting | Value
139-
------------- | -------------
140-
Host | ftp
141-
Ports | 20,21
142-
User | dev (if not changed in env)
143-
Password | dev (if not changed in env)
144-
Path | /data/ftp (if not changed in env)
14561

14662
## Environment settings
14763

documentation/SERVICES.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
[<-- Back to main section](../README.md)
2+
3+
# Services
4+
5+
### Web (Nginx or Apache HTTPd)
6+
7+
Setting | Value
8+
------------- | -------------
9+
Host | web:80 and web:443 (ssl)
10+
External Port | 8000 and 8443 (ssl)
11+
12+
### MySQL
13+
14+
You can choose between [MySQL](https://www.mysql.com/) (default), [MariaDB](https://www.mariadb.org/)
15+
and [PerconaDB](http://www.percona.com/software) in `docker/mysql/Dockerfile`
16+
17+
Setting | Value
18+
------------- | -------------
19+
User | dev (if not changed in env)
20+
Password | dev (if not changed in env)
21+
Database | database (if not changed in env)
22+
Host | mysql:3306
23+
External Port | 13306
24+
25+
Access fo MySQL user "root" and "dev" will be allowed from external hosts (eg. for debugging, dumps and other stuff).
26+
27+
28+
### PostgreSQL
29+
30+
Setting | Value
31+
------------- | -------------
32+
User | dev (if not changed in env)
33+
Password | dev (if not changed in env)
34+
Host | postgres:5432
35+
External Port | 15432
36+
37+
38+
### Solr
39+
40+
Setting | Value
41+
------------- | -------------
42+
Host | solr:8983
43+
External Port | 18983
44+
Cores | docker/solr/conf/solr.xml (data dirs are created automatically)
45+
46+
### Elasticsearch (disabled by default)
47+
48+
Setting | Value
49+
------------- | -------------
50+
Host | elasticsearch:9200 and :9300
51+
External Port | 19200 and 19300
52+
53+
### Redis
54+
55+
Setting | Value
56+
------------- | -------------
57+
Host | redis
58+
Port | 6379
59+
60+
### Memcached
61+
62+
Setting | Value
63+
------------- | -------------
64+
Host | memcached
65+
Port | 11211
66+
67+
### Mailcatcher
68+
69+
Setting | Value
70+
------------- | -------------
71+
Host | mail
72+
SMTP port | 1025
73+
Web port | 1080
74+
75+
### FTP
76+
77+
Setting | Value
78+
------------- | -------------
79+
Host | ftp
80+
Ports | 20,21
81+
User | dev (if not changed in env)
82+
Password | dev (if not changed in env)
83+
Path | /data/ftp (if not changed in env)

0 commit comments

Comments
 (0)