Merge pull request #13 from ba-st/pharo_11

Add Pharo 11 support

Author: gcotelli

.docker/docker-tests.sh

@@ -24,12 +24,12 @@ print_success() {
 }
 
 run_in_compose() {
-  docker-compose --file "$1" up --abort-on-container-exit 
+  docker compose --file "$1" up --abort-on-container-exit 
   stop_compose "$1"
 }
 
 stop_compose() {
-  docker-compose --file "$1" down || docker-compose --file "$1" kill  
+  docker compose --file "$1" down || docker compose --file "$1" kill  
 }
 
 set -e
@@ -61,23 +61,23 @@ print_info "Building pharo-date image"
 docker build --tag pharo-date:sut pharo-date-multistage
 
 print_info "Test #4 - Current date"
-docker-compose --file docker-compose-pharo-date.yml up --detach
+docker compose --file docker-compose-pharo-date.yml up --detach
 sleep 1
 curl -f http://localhost:8080
 print_success "OK"
 stop_compose docker-compose-pharo-date.yml
 print_success "Test #4 - Current date ...[OK]"
 
 print_info "Test #5 - Current date multistage"
-docker-compose --file docker-compose-pharo-date-multistage.yml up --detach
+docker compose --file docker-compose-pharo-date-multistage.yml up --detach
 sleep 1
 curl -f http://localhost:8081
 print_success "OK"
 stop_compose docker-compose-pharo-date-multistage.yml
 print_success "Test #5 - Current date multistage...[OK]"
 
 print_info "Test #6 - Current date balanced"
-docker-compose --file docker-compose-balanced-pharo-date.yml up --detach --scale date=3
+docker compose --file docker-compose-balanced-pharo-date.yml up --detach --scale date=3
 sleep 5
 curl -f http://localhost
 print_success "OK"

.github/workflows/docker-build.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Docker meta
         id: docker_meta_runtime
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v4
         with:
           images: ghcr.io/${{ github.repository_owner }}/pharo
       - name: Set up Docker Buildx
@@ -41,7 +41,7 @@ jobs:
           secrets: GIT_AUTH_TOKEN=${{ secrets.DOCKER_REGISTRY_TOKEN }}
       - name: Docker meta loader
         id: docker_meta_loader
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v4
         with:
           images: ghcr.io/${{ github.repository_owner }}/pharo-loader
       - name: Docker build and push loader

README.md

@@ -15,7 +15,7 @@
 ## Quick start
 
 ```bash
-docker run -it ghcr.io/ba-st/pharo:v10.0.1 pharo --version
+docker run -it ghcr.io/ba-st/pharo:v11.0.0 pharo --version
 ```
 
 ## License

docs/how-to-guides/how-to-use-as-dependency.md

@@ -3,7 +3,7 @@
 In your `Dockerfile` put something like:
 
 ```dockerfile
-FROM ghcr.io/ba-st/pharo:v10.0.1
+FROM ghcr.io/ba-st/pharo:v11.0.0
 ```
 
 If you want to create a custom Pharo image it's better to use multi-stage builds
@@ -13,10 +13,10 @@ configure Iceberg to use HTTPS.
 For example
 
 ```dockerfile
-FROM ghcr.io/ba-st/pharo-loader:v10.0.1 AS loader
+FROM ghcr.io/ba-st/pharo-loader:v11.0.0 AS loader
 RUN pharo metacello install github://owner/repo:branch BaselineOfProject
 
-FROM ghcr.io/ba-st/pharo:v10.0.1
+FROM ghcr.io/ba-st/pharo:v11.0.0
 COPY --from=loader /opt/pharo/Pharo.image ./
 COPY --from=loader /opt/pharo/Pharo.changes ./
 COPY --from=loader /opt/pharo/Pharo*.sources ./

source/Dockerfile

@@ -2,7 +2,7 @@
 FROM alpine:3 as download-image
 RUN apk add unzip
 WORKDIR /tmp/pharo-images
-ADD https://files.pharo.org/image/100/Pharo10.0.1-0.build.527.sha.0542643.arch.64bit.zip ./PharoImage.zip
+ADD https://files.pharo.org/image/110/Pharo11-SNAPSHOT.build.689.sha.8986777.arch.64bit.zip ./PharoImage.zip
 RUN set -eu; \
   unzip PharoImage.zip; \
   rm PharoImage.zip; \

source/Dockerfile-loader

@@ -1,5 +1,5 @@
 ARG BASE_IMAGE=ghcr.io/ba-st/pharo
-ARG VERSION=v10.0.1
+ARG VERSION=v11.0.0
 FROM $BASE_IMAGE:$VERSION
 RUN pharo eval --save "EpMonitor current disable"
 RUN pharo eval --save "EpMonitor current: (EpMonitor newWithLog: EpLog newNull)"