Build Hercules from source to pick up fix for SDL Hyperion issue 782.

Author: RossPatterson

Dockerfile

@@ -1,18 +1,49 @@
 # Dockerfile for the VM/370 Container
-FROM	ubuntu:latest
+# Build the things the final image will need
+FROM ubuntu:latest
 
-RUN	apt-get update
+RUN apt-get update
 RUN apt-get install --no-install-recommends -y unzip wget netcat-traditional ca-certificates
-RUN apt-get install --no-install-recommends -y hercules dos2unix regina-rexx
+RUN apt-get install --no-install-recommends -y dos2unix regina-rexx
 RUN apt-get install --no-install-recommends -y python3 python-is-python3
 
+# Build Hercules 3.x
+RUN <<EOF
+	set -x
+    # Hercules Spinhawk 3.x dependencies:
+    apt-get install -y autoconf automake build-essential gawk git m4 libbz2-dev zlib1g-dev
+
+    mkdir -p ~/build_herc
+    cd ~/build_herc
+    ### TEMP >>>
+    git clone https://github.com/RossPatterson/spinhawk.git
+    cd spinhawk
+    git switch h_0782
+    ### This is what we should normally do instead of the above:
+    # git https://github.com/rbowler/spinhawk.git
+    # cd spinhawk
+    ### <<< TEMP
+    ./util/bldlvlck
+	chmod a+x autogen.sh
+    ./autogen.sh
+    ./configure --prefix=/usr/local/hercules
+    make
+    make check
+    make install
+    cd
+    rm -rf ~/build_herc
+	mkdir -p /opt/hercules/vm370
+    echo "export PATH=\"/usr/local/hercules/bin:\$PATH\"" > /opt/hercules/vm370/setup.sh
+    echo "export LD_LIBRARY_PATH=\"/usr/local/hercules/lib:\$LD_LIBRARY_PATH\"" >> /opt/hercules/vm370/setup.sh
+EOF
+
 WORKDIR     /opt/hercules/vm370
 
 # Local Config files
 COPY *.sh hercules.conf cleandisks.conf ./
 RUN dos2unix *.sh hercules.conf cleandisks.conf
 RUN chmod +x *.sh && \
-	  chmod -x hercules.conf cleandisks.conf
+    chmod -x hercules.conf cleandisks.conf
 
 # DASD
 COPY disks/ ./disks/
@@ -29,8 +60,8 @@ RUN rm cleandisks.conf
 # Create the final Docker Image
 FROM ubuntu:latest
 
-RUN	apt-get update && \
-    apt-get install --no-install-recommends -y hercules c3270 zip unzip netcat-traditional \
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y c3270 zip unzip netcat-traditional \
     dos2unix regina-rexx wget ca-certificates python3 python-is-python3 && \
     apt-get -y purge $(dpkg --get-selections | grep deinstall | sed s/deinstall//g) && \
     rm -rf /var/lib/apt/lists/*
@@ -41,6 +72,7 @@ COPY --from=0 /opt/hercules/vm370/* ./
 
 COPY --from=0 /usr/local/bin/herccontrol /usr/local/bin/herccontrol
 COPY --from=0 /usr/local/bin/yata /usr/local/bin/yata
+COPY --from=0 /usr/local/hercules/ /usr/local/hercules/
 
 EXPOSE      3270 8038 3505
 ENTRYPOINT  ["/opt/hercules/vm370/start_vm370.sh"]

README.md

@@ -7,7 +7,7 @@ The Docker images are at https://hub.docker.com/repository/docker/rosspatterson/
 See this repository's release tab for the Dockerfile build source and the VM/370 DASD files.
 
 # History
-- latest -> 1.6.7
+- latest -> 1.6.8
 - Version 1.6.7 adds Python and switches to the Python version of the herccontrol tool.
 - Version 1.6.0 is built from the VM/370 Community Edition v1.1.2 distribution.
 - Version 1.5.3 is built from the VM/370 Community Edition v1.1.0 distribution.

build.sh

@@ -7,14 +7,19 @@ set -e
 # Show the commands
 set -x
 
-# HercControl
+# Install HercControl
 wget -nv https://raw.githubusercontent.com/RossPatterson/PyHercControl/refs/tags/v1.1.2/PyHercControl/src/herccontrol
 chmod +x herccontrol
 mv herccontrol /usr/local/bin
 
+# Add Hercules to paths
+. /opt/hercules/vm370/setup.sh
+
+
 # Remove Shadow Files
 mkdir -p ./disks/shadows # Hercules won't run sf- if the shadow dir doesn't exist.
 hercules -f cleandisks.conf -d >/dev/null 2>/dev/null &
+sleep 5    # Let Hercules get the HTTP server started
 herccontrol "sf-* force" -w "HHCCD092I"
 herccontrol "exit"
 
@@ -45,7 +50,7 @@ herccontrol "ipl 6a1" -w "USER DSC LOGOFF AS AUTOLOG1"
 
 # LOGON MAINTC AND READ TAPE
 herccontrol "/cp disc" -w "^VM/370 Online"
-herccontrol "/logon maintc maintc" -w "^VM Community Edition V1 R1.2"
+herccontrol "/logon maintc maintc" -w "^VM Community Edition"
 herccontrol "/access (noprof" -w "^Ready;"
 herccontrol "/profile" -w "^Ready;"
 herccontrol "devinit 480 io/yatabin.aws" -w "^HHCPN098I"
@@ -61,13 +66,13 @@ herccontrol "/yata -v" -w "^Ready;"
 herccontrol "/logoff" -w "^VM/370 Online"
 
 # REBUILD CMS
-herccontrol "/logon maint cpcms" -w "^VM Community Edition V1 R1.2"
+herccontrol "/logon maint cpcms" -w "^VM Community Edition"
 herccontrol "/access (noprof" -w "^Ready;"
 herccontrol "/profile" -w "^Ready;"
 herccontrol "/NEWBREXX" -w "^Ready"
 herccontrol "/define storage 16m"  -w "CP ENTERED"
-herccontrol "/ipl 190 clear" -w "^VM Community Edition V1 R1.2"
-herccontrol "/savesys cms" -w "^VM Community Edition V1 R1.2"
+herccontrol "/ipl 190 clear" -w "^VM Community Edition"
+herccontrol "/savesys cms" -w "^VM Community Edition"
 herccontrol "/" -w "^Ready;"
 herccontrol "/logoff" -w "^VM/370 Online"
 

changelog.txt

@@ -1,5 +1,7 @@
 VM/370 Docker Container - Changelog
 ===================================
+1.6.8 - Build Hercules from source to pick up fix for SDL Hyperion issue #782.
+
 1.6.7 - Add Python.
         Replace HercControl 1.1.2 with PyHercControl 1.1.2.
 

start_vm370.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
 # Start Hercules
-mkdir io >/dev/null 2>/dev/null | true
+
+# Add Hercules to paths
+. /opt/hercules/vm370/setup.sh
+
+mkdir io >/dev/null 2>/dev/null || true
 hercules -f hercules.conf -d >/dev/null 2>/dev/null

uprepro.bat

@@ -0,0 +1,21 @@
+@REM Script to update container repositories
+
+@SET TAG=%~1
+@SET REPO=rosspatterson
+
+@IF "%TAG%" EQU "" (
+	ECHO Syntax: %0 tagname
+	EXIT /B 1
+)
+
+@REM Docker Tagging (builder, test and latest)
+docker pull %REPO%/vm370:%TAG%
+
+docker tag %REPO%/vm370:%TAG% %REPO%/vm370:builder
+docker push %REPO%/vm370:builder
+
+@REM docker tag %REPO%/vm370:%TAG% %REPO%/vm370:test
+@REM docker push %REPO%/vm370:test
+
+docker tag %REPO%/vm370:%TAG% %REPO%/vm370:latest
+docker push %REPO%/vm370:latest

uprepro.sh

@@ -1,23 +1,24 @@
 #!/bin/sh
 # Script to update container repositories
 
-TAG=1.5.3
+TAG=$1
+REPO=rosspatterson
+
+if [ "$TAG" = "" ] ; then
+	echo "Syntax: $0 tagname"
+	exit 1
+fi
+
+set -x
+
 # Docker Tagging (builder, test and latest)
-docker pull adriansutherland/vm370:$TAG
-docker tag adriansutherland/vm370:$TAG adriansutherland/vm370:builder
-docker push adriansutherland/vm370:builder
+docker pull $REPO/vm370:$TAG
 
-docker pull adriansutherland/vm370:$TAG
-docker tag adriansutherland/vm370:$TAG adriansutherland/vm370:test
-docker push adriansutherland/vm370:test
+docker tag $REPO/vm370:$TAG $REPO/vm370:builder
+docker push $REPO/vm370:builder
 
-docker pull adriansutherland/vm370:$TAG
-docker tag adriansutherland/vm370:$TAG adriansutherland/vm370:latest
-docker push adriansutherland/vm370:latest
+docker tag $REPO/vm370:$TAG $REPO/vm370:test
+docker push $REPO/vm370:test
 
-# Upload Image to Google Cloud
-# GCLOUD SDK needs to be installed, then linked to Docker Desktop
-# gcloud auth configure-docker
-#docker pull adriansutherland/vm370:test
-#docker tag adriansutherland/vm370:test gcr.io/utility-ridge-243715/vm370:test
-#docker push gcr.io/utility-ridge-243715/vm370:test
+docker tag $REPO/vm370:$TAG $REPO/vm370:latest
+docker push $REPO/vm370:latest