Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed GS version to 3.7.1 #17

Merged
merged 4 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/docker-compose-gem.build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.8"

services:
stone:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions examples/docker-compose-gem.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose.build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.8"

services:
stone:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
14 changes: 8 additions & 6 deletions source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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* \
Expand All @@ -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} \
;

Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -230,7 +233,6 @@ RUN rm -rf \
${GEMSTONE}/sys/midhostagenttopaz.ini \
${GEMSTONE}/sys/runpageauditgem \
${GEMSTONE}/sys/stoned \
${GEMSTONE}/sys/topazSolo.ini \
;

######################
Expand Down
2 changes: 1 addition & 1 deletion source/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/load-rowan-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions source/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down