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

build/add 3.6.1 using alpine 3.18 #7

Merged
merged 2 commits into from
Jun 29, 2023
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: 6 additions & 6 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build and push Docker images
on:
push:
paths:
- '.github/workflows/**'
- 'images'
- ".github/workflows/**"
- "images"
branches:
- 'main'
- "main"
pull_request:
types:
- opened
Expand All @@ -17,15 +17,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version:
[
version: [
{ fish: 3.0.2, alpine: 3.11 },
{ fish: 3.1.2, alpine: 3.13 },
{ fish: 3.2.2, alpine: 3.14 },
{ fish: 3.3.1, alpine: 3.15 },
{ fish: 3.4.1, alpine: 3.16 },
{ fish: 3.5.1, alpine: 3.17 },
{ fish: 3.6.0, alpine: 'edge' },
{ fish: 3.6.1, alpine: 3.18 },
# { fish: 3.6.1, alpine: "edge" }, # priorize latest alpine version
]
fail-fast: false
steps:
Expand Down
31 changes: 17 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# docker-fish
[![docker-pull]](https://hub.docker.com/r/purefish/docker-fish)
# docker-fish

[![docker-pull]](https://hub.docker.com/r/purefish/docker-fish)
[![ci-status]][ci-link]
![docker-size]
![docker-size]
[![sponsors]][sponsor-link]


> Docker images for the [Fish shell][fish] projects to test in control environment

## Usage
Expand All @@ -31,15 +31,18 @@ We provide the following versions of Fish, thanks to Alpine package. Simplify sp
❯ docker run --interactive --tty --rm purefish/docker-fish:3.5.1
```

| Fish | Alpine |
| ------- | ------ |
| `3.0.2` | `3.11` |
| `3.1.2` | `3.13` |
| `3.2.2` | `3.14` |
| `3.3.1` | `3.15` |
| `3.4.1` | `3.16` |
| `3.5.1` | `3.17`, `latest`
| `3.6.0` | `edge` |
<!-- see: https://pkgs.alpinelinux.org/packages?name=fish&branch=edge&repo=&arch=&maintainer= -->
| Fish | Alpine |
| ------- | ---------------- |
| `3.0.2` | `3.11` |
| `3.1.2` | `3.13` |
| `3.2.2` | `3.14` |
| `3.3.1` | `3.15` |
| `3.4.1` | `3.16` |
| `3.5.1` | `3.17` |
| `3.6.1` | `3.18`, `latest` |

<!-- | `3.6.1` | `edge` | -->

## Installed Packages

Expand Down Expand Up @@ -73,4 +76,4 @@ We provide the following versions of Fish, thanks to Alpine package. Simplify sp
[ci-link]: <https://github.com/pure-fish/pure/actions> "Github CI"
[ci-status]: https://img.shields.io/github/actions/workflow/status/pure-fish/docker-fish/.github/workflows/build-images.yml?style=flat-square
[sponsors]: https://img.shields.io/github/sponsors/edouard-lopez?label=💰&style=flat-square "GitHub Sponsors"
[sponsor-link]: https://github.com/sponsors/edouard-lopez/ "Become a sponsor"
[sponsor-link]: https://github.com/sponsors/edouard-lopez/ "Become a sponsor"
7 changes: 5 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,8 @@ run-3-4-1: (run "3.4.1")
build-3-5-1 verbose="false": (build "3.17" "3.5.1" verbose)
run-3-5-1: (run "3.5.1")

build-3-6-0 verbose="false": (build "edge" "3.6.0" verbose)
run-3-6-0: (run "3.6.0")
build-3-6-1 verbose="false": (build "3.18" "3.6.1" verbose)
run-3-6-1: (run "3.6.1")

# build-3-6-2 verbose="false": (build "edge" "3.6.2" verbose)
# run-3-6-2: (run "3.6.2")