1
0
Эх сурвалжийг харах

Merge pull request #3295 from londoncalling/docs-format-followup-PR3275

added some formatting on the Wordress steps, and made heading levels …
Victoria 9 жил өмнө
parent
commit
97467c7dec
2 өөрчлөгдсөн 30 нэмэгдсэн , 8 устгасан
  1. 3 3
      docs/django.md
  2. 27 5
      docs/wordpress.md

+ 3 - 3
docs/django.md

@@ -15,7 +15,7 @@ weight=4
 This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting, you'll need to have
 [Compose installed](install.md).
 
-## Define the project components
+### Define the project components
 
 For this project, you need to create a Dockerfile, a Python dependencies file,
 and a `docker-compose.yml` file.
@@ -89,7 +89,7 @@ and a `docker-compose.yml` file.
 
 10. Save and close the `docker-compose.yml` file.
 
-## Create a Django project
+### Create a Django project
 
 In this step, you create a Django started project by building the image from the build context defined in the previous procedure.
 
@@ -137,7 +137,7 @@ In this step, you create a Django started project by building the image from the
         -rw-r--r--  1 user  staff   16 Feb 13 23:01 requirements.txt
 
 
-## Connect the database
+### Connect the database
 
 In this section, you set up the database connection for Django.
 

+ 27 - 5
docs/wordpress.md

@@ -16,7 +16,7 @@ You can use Docker Compose to easily run WordPress in an isolated environment bu
 with Docker containers. This quick-start guide demonstrates how to use Compose to set up and run WordPress. Before starting, you'll need to have
 [Compose installed](install.md).
 
-## Define the project
+### Define the project
 
 1. Create an empty project directory.
 
@@ -64,15 +64,37 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
 
 ### Build the project
 
-Now, run `docker-compose up -d` from your project directory. This will pull the needed images, and then start the wordpress and database containers.
+Now, run `docker-compose up -d` from your project directory.
+
+This pulls the needed images, and starts the wordpress and database containers, as shown in the example below.
+
+    $ docker-compose up -d
+    Creating network "my_wordpress_default" with the default driver
+    Pulling db (mysql:5.7)...
+    5.7: Pulling from library/mysql
+    efd26ecc9548: Pull complete
+    a3ed95caeb02: Pull complete
+    ...
+    Digest: sha256:34a0aca88e85f2efa5edff1cea77cf5d3147ad93545dbec99cfe705b03c520de
+    Status: Downloaded newer image for mysql:5.7
+    Pulling wordpress (wordpress:latest)...
+    latest: Pulling from library/wordpress
+    efd26ecc9548: Already exists
+    a3ed95caeb02: Pull complete
+    589a9d9a7c64: Pull complete
+    ...
+    Digest: sha256:ed28506ae44d5def89075fd5c01456610cd6c64006addfe5210b8c675881aff6
+    Status: Downloaded newer image for wordpress:latest
+    Creating my_wordpress_db_1
+    Creating my_wordpress_wordpress_1
+
+### Bring up WordPress in a web browser
 
 If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
 
 At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.
 
-**NOTE**: The Wordpress site will not be immediately available on port `8000` because
-the containers are still being initialized and may take a couple of minutes before the
-first load.
+**NOTE**: The Wordpress site will not be immediately available on port `8000` because the containers are still being initialized and may take a couple of minutes before the first load.
 
 ![Choose language for WordPress install](images/wordpress-lang.png)