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

Update pharo image to v10.0.1 #6

Merged
merged 5 commits into from
Aug 24, 2022
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
12 changes: 7 additions & 5 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -31,24 +31,26 @@ 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
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
uses: crazy-max/ghaction-docker-meta@v1
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
if: ${{ github.event_name != 'pull_request' }}
with:
context: ./source
file: ./source/Dockerfile-loader
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 }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/how-to-guides/how-to-use-as-dependency.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ./
Expand Down
6 changes: 3 additions & 3 deletions source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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 <[email protected]>"
FROM ghcr.io/ba-st/pharo-vm:v9.0.17 as image
LABEL org.opencontainers.image.authors="Buenos Aires Smalltalk <[email protected]>"
WORKDIR /opt/pharo
USER root
RUN set -eu; \
Expand Down
3 changes: 2 additions & 1 deletion source/Dockerfile-loader
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FROM ghcr.io/ba-st/pharo:v10.0.0
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"