More page bundles

nginx.conf

@@ -62,6 +62,8 @@ http {
         /res/images/yubikey/wisdom_of_the_ancients.png  /2016/08/11/offline-gnupg-master-yubikey-subkeys/wisdom_of_the_ancients.png;
         /res/images/ssh/openssh.png                     /2016/10/18/shoring-up-sshd/openssh.png;
         /res/images/ssh/ssh-audit-github.png            /2016/10/18/shoring-up-sshd/ssh-audit-github.png;
+        /res/images/android-tests/spoon.png             /2017/05/16/android-tests-espresso-spoon/spoon.png;
+        /res/images/android-tests/spoon-espresso.png    /2017/05/16/android-tests-espresso-spoon/spoon-espresso.png;
     }
 
     server {

site/assets/style/modules/_articles.sass

@@ -19,7 +19,7 @@ article
   img
     max-width: 100%
 
-  img + p
+  img + p, img + h3
     margin-top: 1.5em
 
   p a, figcaption a

site/content/post/2017-05-16-android-tests-espresso-spoon.md → site/content/post/2017-05-16-android-tests-espresso-spoon/index.md

@@ -1,10 +1,16 @@
 ---
 date: 2017-05-16
 title: Android testing with Espresso and Spoon
-url: /2017/05/16/android-espresso-spoon/
-image: /res/images/android-tests/spoon-espresso.png
 description: Automatically running Android UI tests, reducing flakeyness, and getting useful debugging information back on failure.
 area: Android
+url: /2017/05/16/android-espresso-spoon/
+
+resources:
+  - src: spoon-espresso.png
+    name: Spoon output details, showing a screenshot captured of the failure
+    default: true
+  - src: spoon.png
+    name: Spoon output summary, showing results of 171 tests run on 3 devices
 ---
 
 I've been spending some time recently setting up automated testing for our
@@ -49,7 +55,7 @@ Spoon produces HTML reports, showing the status of each test run on each device.
 We have the report output folder collected as a build artefact, so the reports
 can be seen right from the build server:
 
-<img src="/res/images/android-tests/spoon.png" alt="Spoon output summary, showing results of 171 tests run on 3 devices">
+{{< img "Spoon output summary, showing results of 171 tests run on 3 devices" >}}
 
 ### Flake-free UI testing with Espresso
 
@@ -160,7 +166,7 @@ Espresso's original handler so that it can output its debugging information
 and fail the test. The Spoon runner automatically picks up the screenshot and
 adds it to the report:
 
-<img src="/res/images/android-tests/spoon-espresso.png" alt="Spoon output details, showing a screenshot captured of the failure">
+{{< img "Spoon output details, showing a screenshot captured of the failure" >}}
 
 Having the screenshot, error message and logs all presented in a clean UI
 makes debugging failures much, much easier than searching through a huge build

site/content/post/2019-04-01-understanding-docker-volume-mounts.md → site/content/post/2019-04-01-understanding-docker-volume-mounts/index.md

@@ -1,16 +1,16 @@
 ---
 date: 2019-04-01
 title: Understanding Docker volume mounts
-url: /2019/04/01/understanding-docker-volume-mounts/
-image: /res/images/docker/logo.png
 description: It's basically magic.
 area: Docker
+url: /2019/04/01/understanding-docker-volume-mounts/
+
+resources:
+  - src: logo.png
+    name: The Docker project logo
 ---
 
-<figure class="left">
-  <img src="/res/images/docker/logo.png" alt="Docker logo">
-  <figcaption>The Docker project logo</figcaption>
-</figure>
+{{< figure "left" "The Docker project logo" >}}
 
 One thing that always confuses me with Docker is how exactly mounting
 volumes behaves. At a basic level it's fairly straight forward: you