Add base_image end-point

Dockerfile

@@ -1,9 +1,15 @@
-FROM cyberdojo/sinatra-base:db948c1
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
 LABEL [email protected]
 
 WORKDIR /dashboard
+
 COPY source/server .
 
+# ARGs are reset after FROM See https://github.com/moby/moby/issues/34129
+ARG BASE_IMAGE
+ENV BASE_IMAGE=${BASE_IMAGE}
+
 ARG COMMIT_SHA
 ENV SHA=${COMMIT_SHA}
 

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2024, [CyberDojo Foundation](http://blog.cyber-dojo.org/2015/08/cyber-dojo-foundation.html)
+Copyright (c) 2025, [CyberDojo Foundation](http://blog.cyber-dojo.org/2015/08/cyber-dojo-foundation.html)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

bin/build_image.sh

@@ -13,8 +13,8 @@ show_help()
     Use: ${MY_NAME} {server|client}
 
     Options:
-      server  - build the server image (local only)
-      client  - build the client image (local and CI workflow)
+      server  - build the server image
+      client  - build the client image
 
 EOF
 }
@@ -43,21 +43,14 @@ check_args()
 build_image()
 {
   check_args "$@"
-
   local -r type="${1}"
-
-  if [ -n "${CI:-}" ] && [ "${type}" == 'server' ] ; then
-    stderr "In CI workflow - use previous docker/build-push-action@v6 GitHub Action"
-    exit 42
-  fi
-
   exit_non_zero_unless_installed docker
   export $(echo_versioner_env_vars)
 
   containers_down
   remove_old_images
 
-  docker compose build --build-arg COMMIT_SHA="${COMMIT_SHA}" server
+  docker compose build server
   #if [ "${type}" == 'client' ]; then
   #  docker compose build --build-arg COMMIT_SHA="${COMMIT_SHA}" client
   #fi
@@ -76,6 +69,7 @@ build_image()
     docker tag "${image_name}" "cyberdojo/dashboard:${CYBER_DOJO_DASHBOARD_TAG}"
     echo "CYBER_DOJO_DASHBOARD_SHA=${CYBER_DOJO_DASHBOARD_SHA}"
     echo "CYBER_DOJO_DASHBOARD_TAG=${CYBER_DOJO_DASHBOARD_TAG}"
+    echo cyberdojo/dashboard:${CYBER_DOJO_DASHBOARD_TAG}
   fi
 }
 

bin/demo.sh

@@ -14,6 +14,7 @@ curl_smoke_test()
   curl_json_body_200 alive
   curl_json_body_200 ready
   curl_json_body_200 sha
+  curl_json_body_200 base_image
 
   curl_plain_200 assets/app.css 'content-type: text/css'
   curl_plain_200 assets/app.js 'content-type: application/javascript'

bin/lib.sh

@@ -23,6 +23,10 @@ echo_versioner_env_vars()
   local -r AWS_ACCOUNT_ID=244531986313
   local -r AWS_REGION=eu-central-1
   echo CYBER_DOJO_DASHBOARD_IMAGE="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/dashboard"
+
+  if [[ ! -v CYBER_DOJO_DASHBOARD_BASE_IMAGE ]] ; then
+    echo CYBER_DOJO_DASHBOARD_BASE_IMAGE=cyberdojo/sinatra-base:db948c1
+  fi
 }
 
 containers_down()

docker-compose.yml

@@ -15,7 +15,9 @@ services:
     image: ${CYBER_DOJO_DASHBOARD_CLIENT_IMAGE}:${CYBER_DOJO_DASHBOARD_TAG}
     user: ${CYBER_DOJO_DASHBOARD_CLIENT_USER}
     build:
-      args: [ COMMIT_SHA ]
+      args:
+        - COMMIT_SHA
+        - BASE_IMAGE=${CYBER_DOJO_DASHBOARD_BASE_IMAGE}
       context: source/client
     container_name: ${CYBER_DOJO_DASHBOARD_CLIENT_CONTAINER_NAME}
     depends_on:
@@ -36,7 +38,9 @@ services:
     image: ${CYBER_DOJO_DASHBOARD_IMAGE}:${CYBER_DOJO_DASHBOARD_TAG}
     user: ${CYBER_DOJO_DASHBOARD_SERVER_USER}
     build:
-      args: [ COMMIT_SHA ]
+      args:
+        - COMMIT_SHA
+        - BASE_IMAGE=${CYBER_DOJO_DASHBOARD_BASE_IMAGE}
       context: .
     container_name: ${CYBER_DOJO_DASHBOARD_SERVER_CONTAINER_NAME}
     depends_on:

source/client/Dockerfile

@@ -1,9 +1,16 @@
-FROM cyberdojo/sinatra-base:db948c1
+#FROM cyberdojo/sinatra-base:db948c1
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
 LABEL [email protected]
 
 WORKDIR /app
+
 COPY . .
 
+# ARGs are reset after FROM See https://github.com/moby/moby/issues/34129
+ARG BASE_IMAGE
+ENV BASE_IMAGE=${BASE_IMAGE}
+
 ARG COMMIT_SHA
 ENV SHA=${COMMIT_SHA}
 

source/server/app/app.rb

@@ -16,6 +16,7 @@ def initialize(externals)
   get_delegate(Prober, :alive?)
   get_delegate(Prober, :ready?)
   get_delegate(Prober, :sha)
+  get_delegate(Prober, :base_image)
 
   get '/show/:id', provides: [:html] do
     @id = params[:id]

source/server/app/prober.rb

@@ -18,6 +18,10 @@ def sha(_args)
     ENV.fetch('SHA', nil)
   end
 
+  def base_image(_args)
+    ENV.fetch('BASE_IMAGE', nil)
+  end
+
   private
 
   def saver