some fixes from the wip in the docker test pr

Author: hjwp

chapter_09_docker.asciidoc

@@ -984,18 +984,15 @@ $ pass:quotes[*curl -iv localhost:8888*]
 * connect to 127.0.0.1 port 8888 [...]
 *   Trying [::1]:8888...
 * connect to ::1 port 8888 [...]
-* Failed to connect to localhost port 8888 after 0 ms: Couldn't connect to
-server
+* Failed to connect to localhost port 8888 after 0 ms: [...]
 * Closing connection
 [...]
-curl: (7) Failed to connect to localhost port 8888 after 0 ms: Couldn't connect
-to server
+curl: (7) Failed to connect to localhost port 8888 after 0 ms: [...]
 ----
 
 TIP: The `-iv` flag to curl is useful for debugging.
     It prints verbose output, as well as full HTTP headers.
 
-// CSANAD:  my `curl` output is slightly different, but it doesn't change much.
 
 
 === Running code "inside" the container with docker exec
@@ -1118,7 +1115,7 @@ Similarly, if you try our `curl -iv` (outside the container) once again,
 you'll see the error has changed from "Failed to connect",
 to "Empty reply":
 
-[role="ignore-errors pause-first"]
+[role="ignore-errors"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*curl -iv localhost:8888*]
@@ -1216,7 +1213,6 @@ Starting development server at http://0.0.0.0:8888/
 
 We can verify it's working with `curl`:
 
-[role="pause-first"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*curl -iv localhost:8888*]
@@ -1372,7 +1368,7 @@ Starting development server at http://0.0.0.0:8888/
 
 ...and try our FTs again, they all pass!
 
-[role="small-code pause-first"]
+[role="small-code"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*TEST_SERVER=localhost:8888 ./src/manage.py test src/functional_tests \

chapter_10_production_readiness.asciidoc

@@ -80,14 +80,12 @@ We'll need to first install Gunicorn into our container,
 and then use it instead of `runserver`:
 
 
-// todo test this
-[role="skipme"]
 [subs="specialcharacters,quotes"]
 ----
-$ *pip install gunicorn*
+$ *python -m pip install gunicorn*
 Collecting gunicorn
 [...]
-Successfully installed gunicorn-21.2.0
+Successfully installed gunicorn-22.[...]
 ----
 
 [[what-is-wsgi]]
@@ -173,8 +171,7 @@ As we run the functional tests, you'll see them warning us of a problem, once ag
 The test for adding list items passes happily,
 but the test for layout + styling fails. Good job, tests!
 
-// todo: replace pause-first with systematic pause after every docker spinup
-[role="small-code pause-first"]
+[role="small-code"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:quotes[*TEST_SERVER=localhost:8888 python src/manage.py test functional_tests \
@@ -216,7 +213,7 @@ files from Python.
 
 First we install Whitenoise into our local environment:
 
-[role="skipme"]
+
 [subs="specialcharacters,quotes"]
 ----
 *pip install whitenoise*
@@ -315,8 +312,9 @@ I'm sure you'll come across many others.]
 
 The `pip freeze` command will show us everything that's installed in our virtualenv at the moment:
 
-// JAN: This is true only if one installs the libraries locally. So far when following the book we installed them only inside Docker image
 
+// version numbers change too much
+[role="skipme"]
 [subs="specialcharacters,quotes"]
 ----
 $ *pip freeze*
@@ -351,7 +349,7 @@ Django, Gunicorn and Whitenoise:
 [subs="specialcharacters,quotes"]
 ----
 $ *pip freeze | grep -i django*
-Django==4.2.11
+Django==4.2.[...]
 
 $ *pip freeze | grep -i django >> requirements.txt*
 $ *pip freeze | grep -i gunicorn >> requirements.txt*
@@ -361,7 +359,7 @@ $ *pip freeze | grep -i whitenoise >> requirements.txt*
 That should give us a requirements.txt file that looks like this:
 
 
-[role="sourcecode"]
+[role="sourcecode skipme"]
 .requirements.txt (ch10l004)
 ====
 [source,python]
@@ -410,6 +408,7 @@ TIP: Itamar Turner-Traurig has a great guide to
 
 Now let's see how we use that requirements file in our Dockerfile:
 
+[role="sourcecode"]
 .Dockerfile (ch10l005)
 ====
 [source,dockerfile]
@@ -510,7 +509,7 @@ Let them be an inspiration (but not a template) for your own choices!
 Note that this if statement replaces the DEBUG and SECRET_KEY lines that are included by default in the settings.py file:
 
 [role="sourcecode"]
-.superlists/settings.py (ch10l006)
+.src/superlists/settings.py (ch10l006)
 ====
 [source,python]
 ----
@@ -578,6 +577,7 @@ And try it out...
 
 
 
+[role="ignore-errors"]
 [subs="specialcharacters,macros"]
 ----
 $ pass:specialcharacters,quotes[*docker build -t superlists . && docker run \
@@ -589,7 +589,7 @@ $ pass:specialcharacters,quotes[*docker build -t superlists . && docker run \
   File "/src/superlists/settings.py", line 22, in <module>
     SECRET_KEY = os.environ["DJANGO_SECRET_KEY"]
                  ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^
-  File "<frozen os>", line 685, in __getitem__
+[...]
 KeyError: 'DJANGO_SECRET_KEY'
 ----
 
@@ -673,7 +673,7 @@ Let's use another environment variable for that:
 
 
 [role="sourcecode"]
-.superlists/settings.py (ch10l008)
+.src/superlists/settings.py (ch10l008)
 ====
 [source,python]
 ----
@@ -744,7 +744,7 @@ ENV DJANGO_DEBUG_FALSE=1
 CMD gunicorn --bind :8888 superlists.wsgi:application
 ----
 ====
-// CSANAD: I think it would be important to use a non-privileged user in Docker
+
 
 // DAVID: It would be nice to explain the difference between RUN and CMD.
 
@@ -760,9 +760,11 @@ Well, it was fiddly, but that should get us to passing tests after we build & ru
 [subs="specialcharacters,quotes"]
 ----
 $ *docker build -t superlists . && docker run \
-  -p 8888:8888 \
-  --mount type=bind,source=./src/db.sqlite3,target=/src/db.sqlite3 \
-  -it superlists*
+    -p 8888:8888 \
+    --mount type=bind,source=./src/db.sqlite3,target=/src/db.sqlite3 \
+    -e DJANGO_SECRET_KEY=sekrit \
+    -e DJANGO_ALLOWED_HOST=localhost \
+    -it superlists*
 ----
 
 and...
@@ -811,6 +813,7 @@ TODO: apologies, WIP, this is definitely a good idea for security, needs writing
 
 Dockerfile should gain some lines a bit like this:
 
+[role="sourcecode skipme"]
 .Dockerfile (ch10l0XX)
 ====
 [source,dockerfile]
@@ -868,6 +871,7 @@ image::images/server_error_500.png["A minimal error page saying just Server erro
 
 But if you look in your docker terminal, you'll see there is no traceback:
 
+[role="skipme"]
 ----
 [2024-02-28 10:41:53 +0000] [7] [INFO] Starting gunicorn 21.2.0
 [2024-02-28 10:41:53 +0000] [7] [INFO] Listening at: http://0.0.0.0:8888 (7)
@@ -918,10 +922,23 @@ LOGGING = {
 ----
 ====
 
-Rebuild and restart our container,
-try the FT again (or submitting a new list item manually)
+Rebuild and restart our container...
+
+[subs="specialcharacters,quotes"]
+----
+$ *docker build -t superlists . && docker run \
+    -p 8888:8888 \
+    --mount type=bind,source=./src/db.sqlite3,target=/src/db.sqlite3 \
+    -e DJANGO_SECRET_KEY=sekrit \
+    -e DJANGO_ALLOWED_HOST=localhost \
+    -it superlists*
+----
+
+Then try the FT again (or submitting a new list item manually)
 and we now should see a clear error message:
 
+// TODO: test get from docker logs
+[role="skipme"]
 ----
 Internal Server Error: /lists/new
 Traceback (most recent call last):
@@ -946,7 +963,7 @@ when considering production-readiness,
 we've worked in small steps and used our tests all the way along,
 and we're now ready to deploy our container to a real server!
 
-Find out how, in our next exciting installment...
+Find out how, in our next exciting instalment...
 
 
 [role="pagebreak-before less_space"]