Merge pull request #212 from orionrobots/fix-images

Improve shell - swap out non-working tab gallery

Author: dannystaple

README.md

@@ -17,7 +17,7 @@ docker compose up --build --remove-orphans
 
 Get a bash prompt in the serve container:
 ```bash
-docker compose run --interactive serve bash
+docker compose run shell
 ```
 
 **Note:** `node_modules` are managed inside the container. You do not need to run `npm install` on your host.

content/2004/11/05/simple-parallel-port-led.md

@@ -8,13 +8,6 @@ tags:
 - parallel port
 title: Simple Parallel Port LED
 thumbnail: content/2004/11/05/cable-with-led.jpg
-led_gallery:
-    - src: content/2004/11/05/led-close-up-lit.jpg
-      alt: LED Close Up Lit
-    - src: content/2004/11/05/led-lit-in-dark.jpg
-      alt : LED Lit In Dark
-    - src: content/2004/11/05/led-close-up-unlit.jpg
-      alt: LED Close Up Unlit
 ---
 ## Intro
 
@@ -138,4 +131,6 @@ This will turn on, then off for a second. Put it into a while loop to blink unti
 
 You need to press Ctrl-C to stop this blinking.
 
-{% tab_gallery "led_gallery", led_gallery %}
+![LED Close Up Lit](led-close-up-lit.jpg "LED Close Up Lit")  
+![LED Lit In Dark](led-lit-in-dark.jpg "LED Lit In Dark")  
+![LED Close Up Unlit](led-close-up-unlit.jpg "LED Close Up Unlit")

content/2023/12/11/change-of-viewpoint-on-wiring.md

@@ -81,7 +81,7 @@ I then had a wiring issue - and the WAGO's helped. First, the test points meant
 
 I tried some fairly aggressive shaking of the wires, and saw no fault. I don't recommend any connection is under stress, but I tried that and it looked good.
 
-They still take a bunch of space, but making blocks of them with bluetac worked for me. It may be tidier if the pigtail connectors were ribbons, as they come as a set of 6 individual wires (or 4 depending on the connector size). However, once I am happy with the connections, I can always go around it with [Spiral Wire Wrap](2021/03/07/wire-wrap).
+They still take a bunch of space, but making blocks of them with bluetac worked for me. It may be tidier if the pigtail connectors were ribbons, as they come as a set of 6 individual wires (or 4 depending on the connector size). However, once I am happy with the connections, I can always go around it with [Spiral Wire Wrap](/2021/03/07/wire-wrap.html).
 
 ## Conclusion
 

docker-compose.yml

@@ -57,3 +57,43 @@ services:
     command: ["rm", "-rf", "_site"]
     profiles:
       - manual
+
+  shell:
+    build:
+      context: .
+      dockerfile: serve.Dockerfile
+      target: debug
+    command: ["bash"]
+    volumes:
+      - .:/app/src
+      - /app/src/node_modules
+    ports:
+      - 8081:8081
+    stdin_open: true
+    tty: true
+    profiles:
+      - manual
+
+  # Run after build - although in the CI this is run from a tarballed build currently
+  http_serve:
+    build:
+      context: .
+      dockerfile: serve.Dockerfile
+      target: httpd_serve
+    volumes:
+      - ./_site:/usr/local/apache2/htdocs/
+      - ./_drafts/staging/http2.conf:/etc/nginx/conf.d/http2.conf
+      - ./htaccess:/usr/local/apache2/htdocs/.htaccess
+    ports:
+      - 8082:80
+    profiles:
+      - manual
+
+  broken_links:
+    build:
+      context: .
+      dockerfile: serve.Dockerfile
+      target: broken_link_checker
+    command: ["http://http_serve"]
+    profiles:
+      - manual

serve.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24-bullseye
+FROM node:24-bullseye AS base
 
 # Create app directory
 WORKDIR /app/src
@@ -10,3 +10,18 @@ RUN npm install
 # Copy rest of the app source
 COPY . /app/src
 
+FROM base AS debug
+
+RUN apt-get update && apt-get install -y \
+    less \
+    iputils-ping \
+    dnsutils
+
+FROM dcycle/broken-link-checker:3 AS broken_link_checker
+
+FROM httpd:2.4.63 AS httpd_serve
+
+# COPY _site /var/www/html/
+COPY _drafts/staging/http2.conf /etc/httpd/conf/httpd.conf
+
+FROM base