Skip to content

Commit 9c8b9a9

Browse files
committed
1 parent a4ef007 commit 9c8b9a9

8 files changed

+14
-14
lines changed

8.2/alpine3.16/Dockerfile 8.4/alpine3.18/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

8.2/bullseye/Dockerfile 8.4/bookworm/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please follow the style of the other Docker Official Images. In particular, use
2828

2929
## Git Commit Messages
3030

31-
Please follow [Angular Commit Message Conventions](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format). The following scopes are currently in use:
31+
Please follow [Angular Commit Message Conventions](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit). The following scopes are currently in use:
3232
- **docker-entrypoint**: the Dockerfile ENTRYPOINT scripts; currently only [docker-entrypoint.sh](docker-entrypoint.sh)
3333
- **docker-library**: the Docker Official Images library entry generator; currently only [generate-stackbrew-library.sh](generate-stackbrew-library.sh)
3434
- **dockerfile-linux**: all Linux variants of the container image itself; includes [Dockerfile-linux.template](Dockerfile-linux.template) and the corresponding Linux variant image definitions in the SATOSA version-specific directories, e.g., **8.2/bullseye/Dockerfile**
@@ -67,7 +67,7 @@ rm -rf manifest-tool
6767
```
6868
Please make note of these tools' dependencies, in particular [GNU Make](https://www.gnu.org/software/make/) and [Go](https://go.dev/).
6969

70-
The templating engine and version tracker require [jq](https://stedolan.github.io/jq/) and [GNU awk](https://www.gnu.org/software/gawk/).
70+
The templating engine and version tracker require [GNU awk](https://www.gnu.org/software/gawk/), [GNU Find Utilities](https://www.gnu.org/software/findutils/), [GNU Wget](https://www.gnu.org/software/wget/), and [jq](https://stedolan.github.io/jq/).
7171

7272
Use [qemu-user-static](https://github.com/multiarch/qemu-user-static) to work with multi-architecture containers.
7373

@@ -88,13 +88,13 @@ Before cloning the repository or working within it, set the [file mode creation
8888

8989
4. Commit all of the modified files. Mention the new SATOSA or base container version in the commit message subject. Reference the release announcement in the commit message body. For example:
9090
```
91-
feat(*): version bump to SATOSA v8.1.0
91+
feat: version bump to SATOSA v8.1.0
9292
9393
Cf. https://github.com/IdentityPython/SATOSA/commit/d44b54433c5b817cf0409855881f6f2c80c27f5c
9494
```
9595
Or for example:
9696
```
97-
feat(*): version bump to Alpine Linux v3.16
97+
feat: version bump to Alpine Linux v3.16
9898
9999
Cf. https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html
100100
```

generate-stackbrew-library.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -Eeuo pipefail
33

44
declare -A aliases=(
5-
[8.2]='8 latest'
5+
[8.4]='8 latest'
66
)
77

88
self="$(basename "$BASH_SOURCE")"

versions.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"8.2": {
2+
"8.4": {
33
"python_version": "3.11",
44
"variants": [
5-
"bullseye",
6-
"alpine3.16"
5+
"bookworm",
6+
"alpine3.18"
77
],
8-
"version": "8.2.0"
8+
"version": "8.4.0"
99
}
1010
}

versions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ eval $(
2222
| jq -r '
2323
. as $versions
2424
| [ $versions|keys[] | select(contains("-rc") | not) ] | sort_by(split(".") | map(tonumber)) | last as $latest
25-
| [ $versions | .[$latest].variants[] | select(test("alpine3.16|slim-bullseye")) ] | join(" ") as $variants
25+
| [ $versions | .[$latest].variants[] | select(test("alpine3.18|slim-bookworm")) ] | join(" ") as $variants
2626
| @sh "export python_version=\($latest) variants=\($variants)"
2727
'
2828
)

0 commit comments

Comments
 (0)