Merge ~valentinviennot/ubuntu-docker-images:update-apache2-readme into ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:readme

Proposed by Valentin Viennot
Status: Merged
Merge reported by: Sergio Durigan Junior
Merged at revision: 6de0866b993a1116530d4a3a32265d99466a3eaf
Proposed branch: ~valentinviennot/ubuntu-docker-images:update-apache2-readme
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:readme
Diff against target: 44 lines (+7/-9)
1 file modified
README.md (+7/-9)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Richard Harding Pending
Review via email: mp+393902@code.launchpad.net

Description of the change

Consistency fixes, removed unused network.

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I've made some modifications to my branch after you proposed this MP. Would you like to review the current README (which is already merged into the edge branch) and see if you have more corrections to suggest?

6de0866... by Valentin Viennot <email address hidden>

clean

Revision history for this message
Valentin Viennot (valentinviennot) wrote :

> I've made some modifications to my branch after you proposed this MP. Would
> you like to review the current README (which is already merged into the edge
> branch) and see if you have more corrections to suggest?

Done it!

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

LGTM, thanks.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

This has been merged to the edge branch:

6de0866b993a1116530d4a3a32265d99466a3eaf

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 7d91297..45f937b 100644
3--- a/README.md
4+++ b/README.md
5@@ -2,9 +2,7 @@
6
7 ## About Apache2
8
9-The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet.
10-
11-Read more on the [apache2 website](https://httpd.apache.org/).
12+The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
13
14 ## Tags
15
16@@ -19,7 +17,7 @@ Read more on the [apache2 website](https://httpd.apache.org/).
17 ### Docker CLI
18
19 ```
20-$ docker run -d --name apache2 -p 8080:80 squeakywheel/apache2:edge
21+$ docker run -d --name apache2 -p 8080:80 -e TZ=Europe/London squeakywheel/apache2:edge
22 ```
23
24 You can now point your browser to http://localhost:8080/ and verify that it works.
25@@ -28,14 +26,14 @@ You can now point your browser to http://localhost:8080/ and verify that it work
26
27 | Parameter | Description |
28 |---|---|
29-| `-e TZ=UTC` | Timezone, e.g. `Europe/London` |
30-| `-v /local/path/to/website:/var/www/html` | Mount and serve a local website |
31-| `-v /my/config/apache2.conf:/etc/apache2/apache2.conf` | Mount a local configuration `apache2.conf` |
32-| `-v /local/path/to/website.conf:/etc/apache2/sites-enabled/website.conf` | Mount and serve a local website, usually as a `VirtualHost` |
33+| `-e TZ=UTC` | Timezone. |
34+| `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. |
35+| `-v /my/config/apache2.conf:/etc/apache2/apache2.conf` | Mount a local configuration `apache2.conf`. |
36+| `-v /local/path/to/website.conf:/etc/apache2/sites-enabled/website.conf` | Mount and serve a local website, usually as a `VirtualHost`. |
37
38 #### Testing/Debugging
39
40-In case you need to debug what it is happening with the container you can run `docker logs <name_of_the_container>`. But if you want to get access to an interactive shell run:
41+In case you need to debug what is happening with the container you can run `docker logs <name_of_the_container>`. To get access to an interactive shell run:
42
43 ```
44 $ docker exec -it <name_of_the_container> /bin/bash

Subscribers

People subscribed via source and target branches