Skip to content

Commit

Permalink
Merge pull request #11 from ba-st/update_vm
Browse files Browse the repository at this point in the history
Update base image to Debian 12 and VM to 10.0.8
  • Loading branch information
gcotelli authored Oct 25, 2023
2 parents 9f848bf + 6edb65d commit 35ada69
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ jobs:
name: Build and Publish Docker images
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository_owner }}/pharo-vm
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to Container Registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
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@v5
with:
context: ./source
file: ./source/Dockerfile
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
name: Markdown Lint
on: [push,pull_request,workflow_dispatch]
on:
- push
- pull_request
- workflow_dispatch
jobs:
remark-lint:
name: runner / markdownlint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: markdownlint
uses: reviewdog/action-markdownlint@v0.1
uses: reviewdog/action-markdownlint@v0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
fail_on_error: true
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Release Notifications

on:
release:
types: [published]
types:
- published

jobs:
notify:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: Unit Tests

on: [push,pull_request,workflow_dispatch]
on:
- push
- pull_request
- workflow_dispatch

jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run tests using Docker
working-directory: .docker
run: ./docker-tests.sh
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 Buenos Aires Smalltalk
Copyright (c) 2022-2023 Buenos Aires Smalltalk

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docker image for Pharo VM

Docker image for running a headless [Pharo VM](https://github.com/pharo-project/pharo-vm)
on top of Debian 11 slim.
on top of Debian 12 slim.

[![Unit Tests](https://github.com/ba-st/docker-pharo-vm/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/ba-st/docker-pharo-vm/actions/workflows/unit-tests.yml/badge.svg)
[![Docker Build](https://github.com/ba-st/docker-pharo-vm/actions/workflows/docker-build.yml/badge.svg)](https://github.com/ba-st/docker-pharo-vm/actions/workflows/docker-build.yml)
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-guides/how-to-use-as-dependency.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
In your `Dockerfile` put something like:

```dockerfile
FROM ghcr.io/ba-st/pharo-vm:v9.0.17
FROM ghcr.io/ba-st/pharo-vm:v10.0.8
```
4 changes: 2 additions & 2 deletions source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
FROM alpine:3.12 as download-vm
RUN apk add unzip
WORKDIR /tmp/pharo-vm
ADD https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/PharoVM-10.0.5-2757766-Linux-x86_64-bin.zip ./PharoVM.zip
ADD https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/PharoVM-10.0.8-b323c5f-Linux-x86_64-bin.zip ./PharoVM.zip
RUN set -eu; \
unzip PharoVM.zip; \
rm PharoVM.zip; \
true

# Copy VM into base image
FROM debian:11-slim as vm
FROM debian:12-slim as vm
LABEL maintainer="Buenos Aires Smalltalk <[email protected]>"
WORKDIR /opt/pharo
RUN set -eu; \
Expand Down

0 comments on commit 35ada69

Please sign in to comment.