From 4302ebc481e0548065ced89c82aa780503e83536 Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 10 Jun 2026 00:43:25 +0000
Subject: [PATCH 1/2] Fix Docker_medley and buildMedleyDocker.yml so that the
 given Medley gibhub release is used for selecting the Medley Docker Image on
 which to basse the Online-Medley docker image

---
 .github/workflows/buildMedleyDocker.yml | 11 +++++++----
 docker_medley/Dockerfile_medley         |  5 ++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/buildMedleyDocker.yml b/.github/workflows/buildMedleyDocker.yml
index 3014b57..b49d8d0 100644
--- a/.github/workflows/buildMedleyDocker.yml
+++ b/.github/workflows/buildMedleyDocker.yml
@@ -123,14 +123,14 @@ jobs:
         run: |
           if [ "${{ inputs.github_release_tag }}" = "Latest" ] || [ "${{ inputs.github_release_tag }}" = "latest" ]
           then
-            DOCKER_TAG=latest
+            MEDLEY_DOCKER_IMAGE_TAG=latest
           else
-            DOCKER_TAG="${{ inputs.github_release_tag }}"
-            DOCKER_TAG="${DOCKER_TAG##medley-}"
+            MEDLEY_DOCKER_IMAGE_TAG="${{ inputs.github_release_tag }}"
+            MEDLEY_DOCKER_IMAGE_TAG="${MEDLEY_DOCKER_IMAGE_TAG##medley-}"
           fi
           DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
           echo "docker_namespace=${DOCKER_NAMESPACE}" >> $GITHUB_OUTPUT
-          docker pull "${DOCKER_NAMESPACE}/medley:${DOCKER_TAG}"
+          docker pull "${DOCKER_NAMESPACE}/medley:${MEDLEY_DOCKER_IMAGE_TAG}"
           RELEASE_INFO=$(docker run --entrypoint /bin/bash ${DOCKER_NAMESPACE}/medley:${DOCKER_TAG} -c "echo \${MAIKO_RELEASE}::::\${MEDLEY_RELEASE}")
           MAIKO_RELEASE=${RELEASE_INFO%::::*}
           MEDLEY_RELEASE=${RELEASE_INFO#*::::}
@@ -138,6 +138,8 @@ jobs:
           echo "maiko_release=${MAIKO_RELEASE}" >> ${GITHUB_OUTPUT}
           echo "MEDLEY_RELEASE=${MEDLEY_RELEASE}" >> ${GITHUB_ENV}
           echo "medley_release=${MEDLEY_RELEASE}" >> ${GITHUB_OUTPUT}
+          echo "MEDLEY_DOCKER_IMAGE_TAG=${MEDLEY_DOCKER_IMAGE_TAG}" >> ${GITHUB_ENV}
+          echo "medley_docker_image_tag=${MEDLEY_DOCKER_IMAGE_TAG}" >> ${GITHUB_OUTPUT}
 
       # Checkout the latest Notecards commit
       - name: Checkout Notecards
@@ -218,6 +220,7 @@ jobs:
             REPO_OWNER=${{ github.repository_owner }}
             NOTECARDS_RELEASE=${{ steps.nc_release_info.outputs.nc_release_tag }}
             PLATFORM=${{ steps.platform_var.outputs.platform }}
+            MEDLEY_DOCKER_IMAGE_TAG=${{ steps.release_info.outputs.medley_docker_image_tag }}
           context: ./docker_medley
           file: ./docker_medley/Dockerfile_medley
           platforms: ${{ inputs.platform }}
diff --git a/docker_medley/Dockerfile_medley b/docker_medley/Dockerfile_medley
index c2eecf2..4c5ed69 100644
--- a/docker_medley/Dockerfile_medley
+++ b/docker_medley/Dockerfile_medley
@@ -14,15 +14,14 @@
 # 
 #
 # *****************************************************************************/
-ARG FROM_TAG=latest
+ARG MEDLEY_DOCKER_IMAGE_TAG=latest
 ARG DOCKER_NAMESPACE=interlisp
 
-FROM ${DOCKER_NAMESPACE}/medley:${FROM_TAG}
+FROM ${DOCKER_NAMESPACE}/medley:${MEDLEY_DOCKER_IMAGE_TAG}
 
 SHELL ["/bin/bash", "-c"]
 USER root:root
 
-ARG FROM_TAG
 ARG BUILD_DATE=unknown
 ARG RELEASE_TAG=unknown
 ARG MAIKO_RELEASE=unknown

From b91278a01c14dcd61fde81eb656807b52dc8fa7a Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Wed, 10 Jun 2026 01:03:21 +0000
Subject: [PATCH 2/2] Fix missed name update in buildMedleyDocker.yml

---
 .github/workflows/buildMedleyDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildMedleyDocker.yml b/.github/workflows/buildMedleyDocker.yml
index b49d8d0..17a2ae2 100644
--- a/.github/workflows/buildMedleyDocker.yml
+++ b/.github/workflows/buildMedleyDocker.yml
@@ -131,7 +131,7 @@ jobs:
           DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
           echo "docker_namespace=${DOCKER_NAMESPACE}" >> $GITHUB_OUTPUT
           docker pull "${DOCKER_NAMESPACE}/medley:${MEDLEY_DOCKER_IMAGE_TAG}"
-          RELEASE_INFO=$(docker run --entrypoint /bin/bash ${DOCKER_NAMESPACE}/medley:${DOCKER_TAG} -c "echo \${MAIKO_RELEASE}::::\${MEDLEY_RELEASE}")
+          RELEASE_INFO=$(docker run --entrypoint /bin/bash ${DOCKER_NAMESPACE}/medley:${MEDLEY_DOCKER_IMAGE_TAG} -c "echo \${MAIKO_RELEASE}::::\${MEDLEY_RELEASE}")
           MAIKO_RELEASE=${RELEASE_INFO%::::*}
           MEDLEY_RELEASE=${RELEASE_INFO#*::::}
           echo "MAIKO_RELEASE=${MAIKO_RELEASE}" >> ${GITHUB_ENV}