Merge pull request #17 from ba-st/15-migrate-gemstone-to-371

Changed GS version to 3.7.1

.github/workflows/docker-build.yml

@@ -16,11 +16,11 @@ jobs:
     strategy:
       matrix:
         version:
-          - '3.7.0'
+          - '3.7.1'
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/markdown-lint.yml

@@ -1,11 +1,14 @@
 name: Markdown Lint
-on: [push,pull_request,workflow_dispatch]
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
 jobs:
   remark-lint:
     name: runner / markdownlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: markdownlint
         uses: reviewdog/action-markdownlint@v0
         with:

.github/workflows/shellcheck.yml

@@ -1,12 +1,12 @@
 name: 'Shellcheck'
-
-on: [push,pull_request]
-
+on:
+  - push
+  - pull_request]
 jobs:
   shellcheck:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Run Shellcheck'
         uses: reviewdog/action-shellcheck@v1
         with:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Buenos Aires Smalltalk
+Copyright (c) 2023-2024 Buenos Aires Smalltalk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

examples/docker-compose-gem.build.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: "3.8"
 
 services:
   stone:
@@ -7,7 +7,7 @@ services:
       context: ../source
       target: docker-gs64-rowan
       args:
-        GS_VERSION: 3.7.0
+        GS_VERSION: 3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:
@@ -28,7 +28,7 @@ services:
       context: ../source
       target: docker-gs64-gem
       args:
-        GS_VERSION: 3.7.0
+        GS_VERSION: 3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:

examples/docker-compose-gem.yml

@@ -1,9 +1,9 @@
-version: "3"
+version: "3.8"
 
 services:
   stone:
     init: true
-    image: ghcr.io/ba-st/gs64-rowan:v3.7.0
+    image: ghcr.io/ba-st/gs64-rowan:v3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:
@@ -20,7 +20,7 @@ services:
     depends_on:
       stone:
         condition: service_started
-    image: ghcr.io/ba-st/gs64-gem:v3.7.0
+    image: ghcr.io/ba-st/gs64-gem:v3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:

examples/docker-compose.build.yml

@@ -1,4 +1,4 @@
-version: "3"
+version: "3.8"
 
 services:
   stone:
@@ -8,7 +8,7 @@ services:
       context: ../source
       target: docker-gs64-rowan
       args:
-        GS_VERSION: 3.7.0
+        GS_VERSION: 3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:

examples/docker-compose.yml

@@ -1,10 +1,10 @@
-version: "3"
+version: "3.8"
 
 services:
   stone:
     init: true
     network_mode: host
-    image: ghcr.io/ba-st/gs64-rowan:v3.7.0
+    image: ghcr.io/ba-st/gs64-rowan:v3.7.1
     cap_add:
       - CAP_SYS_RESOURCE
     environment:

source/Dockerfile

@@ -47,13 +47,20 @@ RUN mkdir - ${GEMSTONE_GLOBAL_DIR} \
 
 # Remove non-essential files to keep the final image size small
 RUN rm -rf \
+  ${GEMSTONE}/bin/gemsetup.csh \
+  ${GEMSTONE}/bin/slow \
+  ${GEMSTONE}/bin/superdoit_baseimage_solo \
+  ${GEMSTONE}/bin/superdoit_rowan3_solo \
+  ${GEMSTONE}/bin/superdoit_solo \
+  ${GEMSTONE}/bin/superdoit_stone \  
   ${GEMSTONE}/bin32/ \
   ${GEMSTONE}/examples/ \
   ${GEMSTONE}/include/ \
   ${GEMSTONE}/install/ \
   ${GEMSTONE}/lib32/ \
   ${GEMSTONE}/projects/ \
   ${GEMSTONE}/rowan/ \
+  ${GEMSTONE}/rowan3/ \
   ${GEMSTONE}/seaside/ \
   ${GEMSTONE}/upgrade/ \
   ${GEMSTONE}/bin/vsd* \
@@ -64,6 +71,7 @@ RUN rm -rf \
   ${GEMSTONE}/lib/pkgconfig/tk* \
   ${GEMSTONE}/lib/rbc* \
   ${GEMSTONE}/doc/man1/vsd.1 \
+  ${GEMSTONE}/sys/topazSolo.ini \  
 && mv ${GEMSTONE}/bin/extent0*.dbf ${DOWNLOAD_LOCATION} \
 ;
 
@@ -184,14 +192,12 @@ FROM download as minimal-download
 # Remove non-essential files to keep the final image size small
 RUN rm -rf \
   ${GEMSTONE}/bin/copydbf \
-  ${GEMSTONE}/bin/gemsetup.csh \
   ${GEMSTONE}/bin/gemstone_data.conf \
   ${GEMSTONE}/bin/pageaudit \
   ${GEMSTONE}/bin/printlogs \
   ${GEMSTONE}/bin/removedbf \
   ${GEMSTONE}/bin/searchlogs \
   ${GEMSTONE}/bin/secure_backup_extract \
-  ${GEMSTONE}/bin/slow \
   ${GEMSTONE}/bin/starthostagent \
   ${GEMSTONE}/bin/startlogreceiver \
   ${GEMSTONE}/bin/startlogsender \
@@ -200,9 +206,6 @@ RUN rm -rf \
   ${GEMSTONE}/bin/stoplogreceiver \
   ${GEMSTONE}/bin/stoplogsender \
   ${GEMSTONE}/bin/stopstone \
-  ${GEMSTONE}/bin/superdoit_baseimage_solo \
-  ${GEMSTONE}/bin/superdoit_solo \
-  ${GEMSTONE}/bin/superdoit_stone \
   ${GEMSTONE}/bin/updatesecuredbf \
   ${GEMSTONE}/bin/upgradeimage \
   ${GEMSTONE}/bin/verify_backup_with_openssl \
@@ -230,7 +233,6 @@ RUN rm -rf \
   ${GEMSTONE}/sys/midhostagenttopaz.ini \
   ${GEMSTONE}/sys/runpageauditgem \
   ${GEMSTONE}/sys/stoned \
-  ${GEMSTONE}/sys/topazSolo.ini \
   ;
 
 ######################

source/configure.sh

@@ -7,7 +7,7 @@ readonly SYSTEM_USER_PASSWORD="${GS64_SYSTEM_USER_PASSWORD:-swordfish}"
 echo "Configuring GS Repository..."
 
 topaz -i -q <<EOF > "${GEMSTONE_LOG_DIR}/configuring-repository.log"
-set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
+set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
 iferror exit 1
 login
 doit

source/load-rowan-project.sh

@@ -24,7 +24,7 @@ touch "${GEMSTONE_LOG_DIR}/loading-rowan-projects.log"
 echo "Installing Rowan fixes"
 
 topaz -i -q <<EOF > "${GEMSTONE_LOG_DIR}/installing-rowan-fixes.log"
-set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
+set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
 iferror exit 1
 login
 input Rowan.gs
@@ -38,7 +38,7 @@ echo "  Project Name: ${LRP_PROJECT_NAME}"
 echo "  Load Spec: ${LRP_LOAD_SPEC}"
 
 topaz -i -q <<EOF > "${GEMSTONE_LOG_DIR}/loading-rowan-projects.log"
-set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
+set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
 iferror exit 1
 login
 doit

source/run-tests.sh

@@ -12,8 +12,9 @@ touch "${GEMSTONE_LOG_DIR}/running-tests.log"
 echo "Installing stdout printer & test reporter"
 
 topaz -i -q <<EOF > "${GEMSTONE_LOG_DIR}/installing-stdout-support.log"
-set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
+set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
 iferror exit 1
+fileformat utf8
 login
 input StdOutPrinter.gs
 input StdOutTestReporter.gs
@@ -25,7 +26,7 @@ EOF
 echo "Running test suite"
 
 topaz -i -q <<EOF > "${GEMSTONE_LOG_DIR}/running-tests.log"
-set gemstone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
+set stone gs64stone user SystemUser pass ${SYSTEM_USER_PASSWORD}
 iferror exit 1
 login
 expectvalue true