From 072f126332d3ece716a0877758829c8c2ca407f4 Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 24 Aug 2022 09:27:26 -0300 Subject: [PATCH 1/5] Update pharo image to v10.0.1 --- README.md | 2 +- docs/how-to-guides/how-to-use-as-dependency.md | 6 +++--- source/Dockerfile | 6 +++--- source/Dockerfile-loader | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1025c88..70f9aaa 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ## Quick start ```bash -docker run -it ghcr.io/ba-st/pharo:v10.0.0 pharo --version +docker run -it ghcr.io/ba-st/pharo:v10.0.1 pharo --version ``` ## License diff --git a/docs/how-to-guides/how-to-use-as-dependency.md b/docs/how-to-guides/how-to-use-as-dependency.md index ada4aeb..6da2be9 100644 --- a/docs/how-to-guides/how-to-use-as-dependency.md +++ b/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.0 +FROM ghcr.io/ba-st/pharo:v10.0.1 ``` 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.0 AS loader +FROM ghcr.io/ba-st/pharo-loader:v10.0.1 AS loader RUN pharo metacello install github://owner/repo:branch BaselineOfProject -FROM ghcr.io/ba-st/pharo:v10.0.0 +FROM ghcr.io/ba-st/pharo:v10.0.1 COPY --from=loader /opt/pharo/Pharo.image ./ COPY --from=loader /opt/pharo/Pharo.changes ./ COPY --from=loader /opt/pharo/Pharo*.sources ./ diff --git a/source/Dockerfile b/source/Dockerfile index fb6cabe..26f77bd 100644 --- a/source/Dockerfile +++ b/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.0-0.build.512.sha.bfb3a61.arch.64bit.zip ./PharoImage.zip +ADD https://files.pharo.org/image/100/Pharo10.0.1-0.build.527.sha.0542643.arch.64bit.zip ./PharoImage.zip RUN set -eu; \ unzip PharoImage.zip; \ rm PharoImage.zip; \ @@ -11,8 +11,8 @@ RUN set -eu; \ true # Copy Pharo Image into base image -FROM ghcr.io/ba-st/pharo-vm:v9.0.14 as image -LABEL maintainer="Buenos Aires Smalltalk " +FROM ghcr.io/ba-st/pharo-vm:v9.0.17 as image +LABEL org.opencontainers.image.authors="Buenos Aires Smalltalk " WORKDIR /opt/pharo USER root RUN set -eu; \ diff --git a/source/Dockerfile-loader b/source/Dockerfile-loader index 32c4ab2..303c7d2 100644 --- a/source/Dockerfile-loader +++ b/source/Dockerfile-loader @@ -1,3 +1,3 @@ -FROM ghcr.io/ba-st/pharo:v10.0.0 +FROM ghcr.io/ba-st/pharo:v10.0.1 RUN pharo eval --save "EpMonitor current disable" RUN pharo eval --save "Iceberg remoteTypeSelector: #httpsUrl" From 6b1dde3c1b960dfae3fe36d1e2ae1586727cbd24 Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 24 Aug 2022 09:42:46 -0300 Subject: [PATCH 2/5] Add argument for the version used in pharo-loader --- .github/workflows/docker-build.yml | 5 +++-- source/Dockerfile-loader | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 17c7fa1..7e98006 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -31,7 +31,7 @@ jobs: username: ${{ secrets.DOCKER_REGISTRY_USERNAME }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Docker build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: ./source file: ./source/Dockerfile @@ -45,10 +45,11 @@ jobs: with: images: ghcr.io/${{ github.repository_owner }}/pharo-loader - name: Docker build and push loader - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: context: ./source file: ./source/Dockerfile-loader + build-args: VERSION=${{ github.ref_name }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta_loader.outputs.tags }} labels: ${{ steps.docker_meta_loader.outputs.labels }} diff --git a/source/Dockerfile-loader b/source/Dockerfile-loader index 303c7d2..48bf5cd 100644 --- a/source/Dockerfile-loader +++ b/source/Dockerfile-loader @@ -1,3 +1,4 @@ -FROM ghcr.io/ba-st/pharo:v10.0.1 +ARG VERSION=v10.0.1 +FROM ghcr.io/ba-st/pharo:$VERSION RUN pharo eval --save "EpMonitor current disable" RUN pharo eval --save "Iceberg remoteTypeSelector: #httpsUrl" From 11ca6b24dc55fdce8594b812f107c14e53a6f07d Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 24 Aug 2022 09:53:09 -0300 Subject: [PATCH 3/5] Use action_ref instead of ref_name --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7e98006..ae7dafb 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -49,7 +49,7 @@ jobs: with: context: ./source file: ./source/Dockerfile-loader - build-args: VERSION=${{ github.ref_name }} + build-args: VERSION=${{ github.action_ref }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta_loader.outputs.tags }} labels: ${{ steps.docker_meta_loader.outputs.labels }} From 2ed8df8b350a844cb9de23a1ce2d0d4d7837293d Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 24 Aug 2022 11:20:18 -0300 Subject: [PATCH 4/5] Fix loader docker build --- .github/workflows/docker-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index ae7dafb..1c5cb97 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Docker meta - id: docker_meta + id: docker_meta_runtime uses: crazy-max/ghaction-docker-meta@v1 with: images: ghcr.io/${{ github.repository_owner }}/pharo @@ -36,8 +36,8 @@ jobs: context: ./source file: ./source/Dockerfile push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.docker_meta.outputs.tags }} - labels: ${{ steps.docker_meta.outputs.labels }} + tags: ${{ steps.docker_meta_runtime.outputs.tags }} + labels: ${{ steps.docker_meta_runtime.outputs.labels }} secrets: GIT_AUTH_TOKEN=${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Docker meta loader id: docker_meta_loader @@ -49,7 +49,7 @@ jobs: with: context: ./source file: ./source/Dockerfile-loader - build-args: VERSION=${{ github.action_ref }} + build-args: VERSION=${{ steps.docker_meta_runtime.outputs.version }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta_loader.outputs.tags }} labels: ${{ steps.docker_meta_loader.outputs.labels }} From 987ad98fae482d22ff433836c89aedd1acfa8c55 Mon Sep 17 00:00:00 2001 From: Gabriel Omar Cotelli Date: Wed, 24 Aug 2022 11:34:41 -0300 Subject: [PATCH 5/5] Do not build loader for PR event --- .github/workflows/docker-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 1c5cb97..55087c9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -46,6 +46,7 @@ jobs: images: ghcr.io/${{ github.repository_owner }}/pharo-loader - name: Docker build and push loader uses: docker/build-push-action@v3 + if: ${{ github.event_name != 'pull_request' }} with: context: ./source file: ./source/Dockerfile-loader