Skip to content

Commit 300e97c

Browse files
authored
Merge pull request #19 from ba-st/update_3.7.1.1
Update GS64 version to 3.7.1.1
2 parents 6d8dc79 + d78cd7a commit 300e97c

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/docker-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
version:
22-
- '3.7.1'
22+
- '3.7.1.1'
2323

2424
steps:
2525
- name: Checkout repository
@@ -44,7 +44,7 @@ jobs:
4444
images: ghcr.io/${{ github.repository_owner }}/gs64
4545

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

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

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

103103
- name: Docker build and push gem image
104-
uses: docker/build-push-action@v5
104+
uses: docker/build-push-action@v6
105105
with:
106106
context: ./source
107107
file: ./source/Dockerfile

examples/docker-compose-gem.build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
context: ../source
88
target: docker-gs64-rowan
99
args:
10-
GS_VERSION: 3.7.1
10+
GS_VERSION: 3.7.1.1
1111
cap_add:
1212
- CAP_SYS_RESOURCE
1313
environment:
@@ -28,7 +28,7 @@ services:
2828
context: ../source
2929
target: docker-gs64-gem
3030
args:
31-
GS_VERSION: 3.7.1
31+
GS_VERSION: 3.7.1.1
3232
cap_add:
3333
- CAP_SYS_RESOURCE
3434
environment:

examples/docker-compose.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
context: ../source
99
target: docker-gs64-rowan
1010
args:
11-
GS_VERSION: 3.7.1
11+
GS_VERSION: 3.7.1.1
1212
cap_add:
1313
- CAP_SYS_RESOURCE
1414
environment:

source/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN apt update \
3030
;
3131

3232
## Donwload GemStone 64 bits release
33-
FROM alpine:3.18 as download
33+
FROM alpine:3.18 AS download
3434

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

86-
FROM base as docker-gs64-server
86+
FROM base AS docker-gs64-server
8787
ARG GS_NETLDI_SERVICE_NAME=gs64ldi
8888
ARG GS_NETLDI_PORT=50384
8989
ARG GS_STONE_SERVICE_NAME=gs64stone
@@ -141,7 +141,7 @@ CMD ["./stone-init.sh"]
141141
### GS Server Base Image ###
142142
############################
143143

144-
FROM docker-gs64-server as docker-gs64-base
144+
FROM docker-gs64-server AS docker-gs64-base
145145

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

156-
FROM docker-gs64-server as docker-gs64-rowan
156+
FROM docker-gs64-server AS docker-gs64-rowan
157157

158158
USER root
159159
# Install git
@@ -188,7 +188,7 @@ CMD ["./stone-init.sh"]
188188
### Reduced download image ###
189189
##############################
190190

191-
FROM download as minimal-download
191+
FROM download AS minimal-download
192192

193193
# Remove non-essential files to keep the final image size small
194194
RUN rm -rf \
@@ -240,7 +240,7 @@ RUN rm -rf \
240240
### GS64 gem image ###
241241
######################
242242

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

0 commit comments

Comments
 (0)