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.

Sign up for GitHub

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

Jump to bottom

Update GS64 version to 3.7.1.1 #19

Merged
merged 1 commit into from
Jul 30, 2024
Merged

Update GS64 version to 3.7.1.1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
version:
- '3.7.1'
- '3.7.1.1'

steps:
- name: Checkout repository
Expand All @@ -44,7 +44,7 @@ jobs:
images: ghcr.io/${{ github.repository_owner }}/gs64

- name: Docker build and push server image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./source
file: ./source/Dockerfile
Expand All @@ -63,7 +63,7 @@ jobs:
images: ghcr.io/${{ github.repository_owner }}/gs64-rowan

- name: Docker build and push rowan image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./source
file: ./source/Dockerfile
Expand All @@ -82,7 +82,7 @@ jobs:
images: ghcr.io/${{ github.repository_owner }}/gs64-base

- name: Docker build and push base image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./source
file: ./source/Dockerfile
Expand All @@ -101,7 +101,7 @@ jobs:
images: ghcr.io/${{ github.repository_owner }}/gs64-gem

- name: Docker build and push gem image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./source
file: ./source/Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose-gem.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
context: ../source
target: docker-gs64-rowan
args:
GS_VERSION: 3.7.1
GS_VERSION: 3.7.1.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.1
GS_VERSION: 3.7.1.1
cap_add:
- CAP_SYS_RESOURCE
environment:
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-compose.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
context: ../source
target: docker-gs64-rowan
args:
GS_VERSION: 3.7.1
GS_VERSION: 3.7.1.1
cap_add:
- CAP_SYS_RESOURCE
environment:
Expand Down
12 changes: 6 additions & 6 deletions source/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apt update \
;

## Donwload GemStone 64 bits release
FROM alpine:3.18 as download
FROM alpine:3.18 AS download

ARG GS_VERSION
ENV GEMSTONE_GLOBAL_DIR=/opt/gemstone
Expand Down Expand Up @@ -83,7 +83,7 @@ RUN sed -ri 's|\$GEMSTONE/data|\$GEMSTONE_GLOBAL_DIR/data|g' ${GEMSTONE}/data/sy
### GS64 Server Image ###
#########################

FROM base as docker-gs64-server
FROM base AS docker-gs64-server
ARG GS_NETLDI_SERVICE_NAME=gs64ldi
ARG GS_NETLDI_PORT=50384
ARG GS_STONE_SERVICE_NAME=gs64stone
Expand Down Expand Up @@ -141,7 +141,7 @@ CMD ["./stone-init.sh"]
### GS Server Base Image ###
############################

FROM docker-gs64-server as docker-gs64-base
FROM docker-gs64-server AS docker-gs64-base

COPY --from=download \
--chown=${GS_USER}:users \
Expand All @@ -153,7 +153,7 @@ CMD ["./stone-init.sh"]
### GS Server Rowan Image ###
#############################

FROM docker-gs64-server as docker-gs64-rowan
FROM docker-gs64-server AS docker-gs64-rowan

USER root
# Install git
Expand Down Expand Up @@ -188,7 +188,7 @@ CMD ["./stone-init.sh"]
### Reduced download image ###
##############################

FROM download as minimal-download
FROM download AS minimal-download

# Remove non-essential files to keep the final image size small
RUN rm -rf \
Expand Down Expand Up @@ -240,7 +240,7 @@ RUN rm -rf \
### GS64 gem image ###
######################

FROM base as docker-gs64-gem
FROM base AS docker-gs64-gem
ARG GS_NETLDI_SERVICE_NAME=gs64ldi
ARG GS_NETLDI_PORT=50384
LABEL maintainer="Buenos Aires Smalltalk <github@fast.org.ar>"
Expand Down