Skip to content

Commit 040a5d3

Browse files
committed
readme formatting
1 parent 1fc2921 commit 040a5d3

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

README.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Apache # → Root of Docker Build
3939
├── Makefile # → Build command shortcuts
4040
├── shippable.yml # → Configuration for Shippable.com testing
4141
└── tests/
42-
└── build_tests.sh # → Build test processes
42+
└── build_tests.sh # → Build test processes
4343
```
4444
Docker Compose YML configuration guide [more info](https://docs.docker.com/docker-cloud/apps/deploy-to-cloud-btn/)
4545

@@ -51,25 +51,24 @@ Launch the **Apache** instance locally and setup a local MySQL database containe
5151
> Type `make` for more build options:
5252
5353
```bash
54-
$ git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache && cd ~/Docker/Apache
55-
$ cp .env.example .env
56-
$ make run
57-
54+
$ git clone https://github.com/htmlgraphic/Apache.git ~/Docker/Apache && cd ~/Docker/Apache
55+
$ cp .env.example .env
56+
$ make run
5857
OR (non Make Windows)
5958

60-
$ copy .env.example .env
61-
$ docker-compose -f docker-compose.local.yml up -d
59+
$ copy .env.example .env
60+
$ docker-compose -f docker-compose.local.yml up -d
6261
```
6362

6463
### Run phpMyAdmin
6564

6665
Review MySQL access instructions upon `make run` command execution. Setup phpMyAdmin directly via command line.
6766

6867
```bash
69-
$ docker run --name myadmin -d --link apache_db_1:db --net apache_default -p 8080:80 phpmyadmin/phpmyadmin
70-
71-
Open http://localhost:8080 (mysql user & password are set within .env file)
68+
$ docker run --name myadmin -d --link apache_db_1:db --net apache_default -p 8080:80 phpmyadmin/phpmyadmin
7269
```
70+
Open http://localhost:8080 (MySQL user & password are set within .env file)
71+
7372

7473
For a secure connection to phpMyAdmin use the **marvambass/phpmyadmin** build, append the following within the `docker-compose*.yml`:
7574

@@ -88,7 +87,7 @@ phpmyadmin:
8887

8988

9089

91-
---
90+
9291

9392
## Test Driven Development
9493
These continuous integration services will fully test the creation of your container and can push the complete image to your private Docker repo if you desire.
@@ -108,44 +107,54 @@ List all running containers:
108107

109108
`docker ps`
110109

110+
111111
List all containers (including stopped containers):
112112

113113
`docker ps -a`
114114

115+
115116
Read the log of a running container:
116117

117118
`docker logs [CONTAINER ID OR NAME]`
118119

120+
119121
Follow the log of a running container:
120122

121123
`docker logs -f [CONTAINER ID OR NAME]`
122124

125+
123126
Read the Apache log:
124127

125128
`docker exec [CONTAINER ID OR NAME] cat ./data/apache2/logs/access_log`
126129

130+
127131
Follow the Apache log:
128132

129133
`docker exec [CONTAINER ID OR NAME] tail -f ./data/apache2/logs/access_log`
130134

135+
131136
Follow the outgoing mail log:
132137

133138
`docker exec [CONTAINER ID OR NAME] tail -f ./var/log/mail.log`
134139

140+
135141
Gain terminal access to a running container:
136142

137143
`docker exec -it [CONTAINER ID OR NAME] /bin/bash`
138144

145+
139146
Restart a running container:
140147

141148
`docker restart [CONTAINER ID OR NAME]`
142149

150+
143151
Stop and start a container in separate operations:
144152

145153
`docker stop [CONTAINER ID OR NAME]`
146154

147155
`docker start [CONTAINER ID OR NAME]`
148156

157+
149158
## Teardown
150159
#### (Stop all running containers started by Docker Compose):
151160

0 commit comments

Comments
 (0)