Skip to content

Commit

Permalink
Upgrade CI to latest OS versions (#746)
Browse files Browse the repository at this point in the history
Signed-off-by: Bolun Thompson <[email protected]>
  • Loading branch information
BolunThompson authored Feb 6, 2025
1 parent 5fbd53b commit 2b7a2b7
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-20.04
- ubuntu-24.04

runs-on: ${{ matrix.os }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ jobs:
- name: Build & Push Debian Image
run: |
cd scripts/docker/debian
docker build -t binpash/pash:debian-10 .
docker push binpash/pash:debian-10
docker build -t binpash/pash:debian-12 .
docker push binpash/pash:debian-12
- name: Build & Push Ubuntu Image
run: |
cd scripts/docker/ubuntu
docker build -t binpash/pash:ubuntu-18.04 .
docker push binpash/pash:ubuntu-18.04
docker tag binpash/pash:ubuntu-18.04 binpash/pash:latest
docker build -t binpash/pash:ubuntu-24.04 .
docker push binpash/pash:ubuntu-24.04
docker tag binpash/pash:ubuntu-24.04 binpash/pash:latest
docker push binpash/pash:latest
- name: Build & Push Fedora Image
run: |
cd scripts/docker/fedora
docker build -t binpash/pash:fedora-35 .
docker push binpash/pash:fedora-35
docker build -t binpash/pash:fedora-41 .
docker push binpash/pash:fedora-41
6 changes: 3 additions & 3 deletions .github/workflows/ghcr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
types: [published]

env:
DEBIAN: pash/debian-10
UBUNTU: pash/ubuntu-18.04
FEDORA: pash/fedora-35
DEBIAN: pash/debian-12
UBUNTU: pash/ubuntu-24.04
FEDORA: pash/fedora-41
IMAGENAME: pash/pash

jobs:
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/contrib.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ This is a small list of useful docker commands. Docker distinguishes between an
```
docker images # shows all images in the system
docker ps -a | grep pash # shows all containers with name pash
docker run --name NN pash/18.04 # creates a writable container (add `-it` for interactive)
docker run --name NN pash/24.04 # creates a writable container (add `-it` for interactive)
docker start -i NN # starts container (add `-i` to drop straight into shell)
docker attach NN # non-interactive -> interactive
<CTL+p>, then <CTL+q> # interactive -> non-interactive
Expand Down Expand Up @@ -109,8 +109,8 @@ wsl --set-default-version 2

Install one of the Linux distributions on which PaSh has been tested from the Microsoft Store:

* [Ubuntu 18.04 LTS](https://www.microsoft.com/store/apps/9N9TNGVNDL3Q)
* [Ubuntu 20.04 LTS](https://www.microsoft.com/store/apps/9n6svws3rx71)
* [Ubuntu 24.04 LTS](https://www.microsoft.com/store/apps/9nz3klhxdjp5)
* [Debian GNU/Linux](https://www.microsoft.com/store/apps/9MSVKQC78PK6)
* [Fedora Remix for WSL](https://www.microsoft.com/store/apps/9n6gdm4k2hnc)

Expand Down
12 changes: 6 additions & 6 deletions scripts/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

Docker files for [PaSh](https://github.com/binpash/pash) published on Dockerhub:

* Ubuntu 18.04: [binpash/pash:ubuntu-18.04](https://hub.docker.com/r/binpash/pash)
* Fedora 35: [binpash/pash:fedora-35](https://hub.docker.com/r/binpash/pash)
* Debian 10: [binpash/pash:debian-10](https://hub.docker.com/r/binpash/pash)
* Ubuntu 24.04: [binpash/pash:ubuntu-24.04](https://hub.docker.com/r/binpash/pash)
* Fedora 41: [binpash/pash:fedora-41](https://hub.docker.com/r/binpash/pash)
* Debian 12: [binpash/pash:debian-12](https://hub.docker.com/r/binpash/pash)

## Run locally

Expand All @@ -28,9 +28,9 @@ docker build -t "pash:latest" .

## As a Dockerfile

* Ubuntu 18.04: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)
* Fedora 35: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)
* Debian 10: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)
* Ubuntu 24.04: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)
* Fedora 41: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)
* Debian 12: [rendered](https://github.com/binpash/pash/blob/main/scripts/docker/ubuntu/Dockerfile); [raw](https://raw.githubusercontent.com/binpash/pash/main/scripts/docker/ubuntu/Dockerfile)

To build any of these containers and run it locally:

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:10
FROM debian:12
SHELL ["/bin/bash", "-c"]
## Necessary to avoid interactive responses in installations
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fedora:35
FROM fedora:41
RUN dnf install git -y
ENV PASH_TOP=/opt/pash
# download PaSh
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:24.04
## Necessary to avoid interactive responses in installations
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -y && apt-get install -y git
Expand Down

0 comments on commit 2b7a2b7

Please sign in to comment.