From ae0382a48cbca9c20dc6a1289568dbbfcdb59a63 Mon Sep 17 00:00:00 2001 From: Viktor Savelev Date: Thu, 1 Jul 2021 02:40:52 +0300 Subject: [PATCH] Typo fixes --- compose-assignment-1/README.md | 2 +- compose-assignment-2/README.md | 4 ++-- swarm-app-1/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compose-assignment-1/README.md b/compose-assignment-1/README.md index 0671f260..03cd93fd 100644 --- a/compose-assignment-1/README.md +++ b/compose-assignment-1/README.md @@ -7,7 +7,7 @@ - Set the version to 2 - Use `ports` to expose Drupal on 8080 - Be sure to setup POSTGRES_PASSWORD on postgres image -- Walk though Drupal config in browser at http://localhost:8080 +- Walk through Drupal config in browser at http://localhost:8080 - Tip: Drupal assumes DB is localhost, but it will actually be on the compose service name you give it - Use Docker Hub documentation to figure out the right environment and volume settings - Extra Credit: Use volumes to store Drupal unique data diff --git a/compose-assignment-2/README.md b/compose-assignment-2/README.md index 827d4edd..e49f346f 100644 --- a/compose-assignment-2/README.md +++ b/compose-assignment-2/README.md @@ -6,7 +6,7 @@ Goal: This time imagine you're just wanting to learn Drupal's admin and GUI, or - Let's pin image version from Docker Hub this time. It's always a good idea to do that so a new major version doesn't surprise you. ## Dockerfile -- First you need to build a custom Dockerfile in this directory, `FROM drupal:8.8.2` NOTE: if it fails to build, try the lastest 8 branch version with `FROM drupal:8` +- First you need to build a custom Dockerfile in this directory, `FROM drupal:8.8.2` NOTE: if it fails to build, try the latest 8 branch version with `FROM drupal:8` - Then RUN apt package manager command to install git: `apt-get update && apt-get install -y git` - Remember to cleanup after your apt install with `rm -rf /var/lib/apt/lists/*` and use `\` and `&&` properly. You can find examples of them in drupal official image. More on this below under Compose file. - Then change `WORKDIR /var/www/html/themes` @@ -23,6 +23,6 @@ Goal: This time imagine you're just wanting to learn Drupal's admin and GUI, or ## Start Containers, Configure Drupal - Start containers like before, configure Drupal web install like before. - After website comes up, click on `Appearance` in top bar, and notice a new theme called `Bootstrap` is there. That's the one we added with our custom Dockerfile. -- Click `Install and set as default`. Then click `Back to site` (in top left) and the website interface should look different. You've successfully installed and activated a new theme in your own custom image without installing anything on your host other then Docker! +- Click `Install and set as default`. Then click `Back to site` (in top left) and the website interface should look different. You've successfully installed and activated a new theme in your own custom image without installing anything on your host other than Docker! - If you exit (ctrl-c) and then `docker-compose down` it will delete containers, but not the volumes, so on next `docker-compose up` everything will be as it was. - To totally clean up volumes, add `-v` to `down` command. diff --git a/swarm-app-1/README.md b/swarm-app-1/README.md index b2fa6a42..1f862189 100644 --- a/swarm-app-1/README.md +++ b/swarm-app-1/README.md @@ -5,7 +5,7 @@ Here is a basic diagram of how the 5 services will work: ![diagram](./architecture.png) - All images are on Docker Hub, so you should use editor to craft your commands locally, then paste them into swarm shell (at least that's how I'd do it) -- a `backend` and `frontend` overlay network are needed. Nothing different about them other then that backend will help protect database from the voting web app. (similar to how a VLAN setup might be in traditional architecture) +- a `backend` and `frontend` overlay network are needed. Nothing different about them other than that backend will help protect database from the voting web app. (similar to how a VLAN setup might be in traditional architecture) - The database server should use a named volume for preserving data. Use the new `--mount` format to do this: `--mount type=volume,source=db-data,target=/var/lib/postgresql/data` ### Services (names below should be service names)