Skip to content

Commit 6a7dfb2

Browse files
committed
fix: adjust some wordings and versions in the README file
1 parent fd67596 commit 6a7dfb2

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Diff for: README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ This is the Git repo of the [Docker "Official Image"](https://github.com/docker-
2020

2121
### Operating System Support
2222

23-
| Operating System | Support | Supported Versions | Support Variants |
24-
|------------------|---------|--------------------|-------------------------------|
25-
| Debian | Yes | buster | standard, slim |
26-
| Alpine | [Planned](https://github.com/haskell/docker-haskell/issues/22) | Last 2 releases | N/A |
27-
| Windows | [Planned](https://github.com/haskell/docker-haskell/issues/3) | ltsc2022 | windowsservercore, nanoserver |
23+
| Operating System | Support | Supported Versions | Support Variants |
24+
| ---------------- | -------------------------------------------------------------- | ------------------------------------------------- | ----------------------------- |
25+
| Debian | Yes | buster, bullseye, bookworm (depending on version) | standard, slim |
26+
| Alpine | [Planned](https://github.com/haskell/docker-haskell/issues/22) | Last 2 releases | N/A |
27+
| Windows | [Planned](https://github.com/haskell/docker-haskell/issues/3) | ltsc2022 | windowsservercore, nanoserver |
2828

2929
### Processor Architecture Support
3030

3131
* amd64
32-
* aarch64 ([does not include Stack](https://github.com/haskell/docker-haskell/issues/59))
32+
* aarch64
3333

3434
### Installation Method
3535

@@ -57,7 +57,7 @@ Verification is done following the ['preferred' method for docker official image
5757

5858
#### GHC
5959

60-
GHC minor versions (eg. 9.2) that are either actively being maintained (new patch releases will come out) or are still popular will be supported by these images. Once both of these are no longer true, support can be dropped. Users can still pull these images, however they will not be listed on the docker hub page and will no longer be updated with new Cabal and Stack versions.
60+
GHC minor versions (eg. 9.10) that are either actively being maintained (new patch releases will come out) or are still popular will be supported by these images. Once both of these are no longer true, support can be dropped. Users can still pull these images, however they will not be listed on the docker hub page and will no longer be updated with new Cabal and Stack versions.
6161

6262
Additionally, only the latest patch version of each major version of GHC will recieve further updates.
6363

@@ -72,7 +72,7 @@ For actively supported GHC versions, Cabal and Stack should be updated when new
7272
You can build and run the images locally with something like:
7373

7474
```bash
75-
$ docker build -t haskell-local 9.2/buster && docker run -it haskell-local bash
75+
$ docker build -t haskell-local 9.10/bullseye && docker run -it haskell-local bash
7676
```
7777

7878
### Updating The Images
@@ -92,8 +92,8 @@ When a new version of Cabal, Stack or GHC is released the images need to be upda
9292

9393
##### GHC
9494

95-
1. Replace the old and new GHC version globally eg. `9.4.3` becomes `9.4.4`. This will update both Dockerfiles **and the github actions**.
96-
2. Obtain the new sha256 for the new GHC binary distribution via https://downloads.haskell.org/~ghc/9.4.4/SHA256SUMS . Look for the sha for the `.tar.xz` supported versions (currently `x86_64-deb10` + `aarch64-deb10`).
95+
1. Replace the old and new GHC version globally eg. `9.8.3` becomes `9.8.4`. This will update both Dockerfiles **and the github actions**.
96+
2. Obtain the new sha256 for the new GHC binary distribution via https://downloads.haskell.org/~ghc/9.8.4/SHA256SUMS . Look for the sha for the `.tar.xz` supported versions (currently `x86_64-deb11` + `aarch64-deb11`).
9797
3. Replace globally the old sha256 for these with the new one obtained in step 2.
9898
4. Update the PGP key if the person doing the release has changed. You can build the image locally at this point to see if it works or not. If it fails you need to update the PGP key. You need to find the key from the person doing the release on the ubuntu keyserver. See below for known releasers.
9999

@@ -105,8 +105,8 @@ An [example](https://github.com/haskell/docker-haskell/commit/d25abd175c94517494
105105

106106
##### Cabal
107107

108-
1. Replace the old and new cabal version globally eg. `3.6.2.0` becomes `3.8.1.0`.
109-
2. Obtain the new sha256 for the new cabal binary distribution via https://downloads.haskell.org/~cabal/cabal-install-3.8.1.0/SHA256SUMS . Look for the sha for the `.tar.xz` supported versions (currently `x86_64-linux-deb10` + `aarch64-linux-deb10`).
108+
1. Replace the old and new cabal version globally eg. `3.8.1.0` becomes `3.10.3.0`.
109+
2. Obtain the new sha256 for the new cabal binary distribution via https://downloads.haskell.org/~cabal/cabal-install-3.10.3.0/SHA256SUMS . Look for the sha for the `.tar.xz` supported versions (currently `x86_64-linux-deb11` + `aarch64-linux-deb11`).
110110
3. Replace globally the old sha256 for these with the new one obtained in step 2.
111111
4. Update the PGP key if the person doing the release has changed. You can build the image locally at this point to see if it works or not. If it fails you need to update the PGP key. You need to find the key from the person doing the release on the ubuntu keyserver. See below for known releasers.
112112

0 commit comments

Comments
 (0)