Skip to content

Commit c404311

Browse files
committed
config indentation fix
1 parent 89553d2 commit c404311

File tree

4 files changed

+29
-0
lines changed

4 files changed

+29
-0
lines changed

README.md

100644100755
+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Supports:
1919
- Memcached (disabled)
2020
- Mailcatcher (if no mail sandbox is used, eg. [Vagrant Development VM](https://github.com/mblaschke/vagrant-development))
2121
- FTP server (vsftpd)
22+
- PhpMyAdmin
2223
- maybe more later...
2324

2425
This Docker boilerplate is based on the [Docker best practices](https://docs.docker.com/articles/dockerfile_best-practices/) and doesn't use too much magic. Configuration of each docker container is available in the `docker/` directory - feel free to customize.

docker-compose.development.yml

100644100755
+16
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,22 @@ mysql:
141141
# - etc/environment.yml
142142
# - etc/environment.development.yml
143143

144+
145+
#######################################
146+
# phpMyAdmin
147+
#######################################
148+
#phpmyadmin:
149+
# image: phpmyadmin/phpmyadmin
150+
# links:
151+
# - mysql
152+
# environment:
153+
# - PMA_ARBITRARY=1
154+
# ports:
155+
# - "8001:80"
156+
# volumes:
157+
# - /sessions
158+
159+
144160
#######################################
145161
# Storage
146162
#######################################

documentation/DOCKER-INFO.md

100644100755
+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ memcached (optional) | Memcached server
1616
redis (optional) | Redis server
1717
ftps (optional) | FTP server (vsftpd)
1818
mailcatcher (optional) | Mailserver with easy web and REST interface for mailing
19+
phpmyadmin (optional) | Tool written in PHP, intended to handle the administration of MySQL over the Web
1920

2021
The `app/` directory will be mounted under `/app` inside `app` container.
2122

@@ -32,6 +33,7 @@ memcached (optional) | [Memcached](https://registry.hub.docker.com/_/memcac
3233
redis (optional) | [Redis](https://registry.hub.docker.com/_/redis/) *official*
3334
ftp (optional) | [Ubuntu](https://registry.hub.docker.com/_/ubuntu/) *official*
3435
mailcatcher (optional) | [Mailcatcher](https://registry.hub.docker.com/u/schickling/mailcatcher/) from _schickling_
36+
phpmyadmin (optional) | [PhpMyAdmin](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) *official*
3537

3638
## Makefile
3739

documentation/SERVICES.md

100644100755
+10
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,13 @@ Ports | 20,21
8181
User | dev (if not changed in env)
8282
Password | dev (if not changed in env)
8383
Path | /storage/ftp (if not changed in env)
84+
85+
### PhpMyAdmin
86+
87+
Setting | Value
88+
------------- | -------------
89+
Host | phpmyadmin
90+
Ports | 8001
91+
Log in server | mysql
92+
Username | dev (if not changed in env, see mysql container configuration)
93+
Password | dev (if not changed in env, see mysql container configuration)

0 commit comments

Comments
 (0)