Skip to content

Commit dc63299

Browse files
authored
Merge pull request #5 from niheconomoum/satosa-upgrade
Upgrade SATOSA to v8.2.0
2 parents d08208f + 4b957e7 commit dc63299

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

8.1/alpine3.16/Dockerfile renamed to 8.2/alpine3.16/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.1/alpine3.16/docker-entrypoint.sh renamed to 8.2/alpine3.16/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.1/bullseye/Dockerfile renamed to 8.2/bullseye/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.1/bullseye/docker-entrypoint.sh renamed to 8.2/bullseye/docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Please follow the style of the other Docker Official Images. In particular, use
3131
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:
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)
34-
- **dockerfile-linux**: all Linux variants of the container image itself; includes [Dockerfile-linux.template](Dockerfile-linux.template) and the corresponding variant image definitions in the SATOSA version-specific directories, e.g., [8.1/bullseye](8.1/bullseye)
34+
- **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**
3535
- **dockerfile-windows**: currently unused
3636
- **git**: Git repository configuration or GitHub-specific files; includes [.gitignore](.gitignore), [.gitattributes](.gitattributes), and [the GitHub Actions workflows](.github/workflows)
3737
- **license**: software licensing information; currently only [LICENSE.md](LICENSE.md)
@@ -71,6 +71,10 @@ The templating engine and version tracker require [jq](https://stedolan.github.i
7171

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

74+
In forks of this repository, enable both GitHub Actions and the GitHub CI workflow after reviewing the workflow definitions.
75+
76+
Before cloning the repository or working within it, set the [file mode creation mask](https://en.wikipedia.org/wiki/Umask) to `0022` or `u=rwx,g=rx,o=rx`.
77+
7478
## Update Process
7579

7680
1. If necessary, update the list of version aliases at the beginning of `generate-stackbrew-library.sh`.
@@ -95,7 +99,7 @@ Use [qemu-user-static](https://github.com/multiarch/qemu-user-static) to work wi
9599
Cf. https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html
96100
```
97101

98-
5. GitHub Actions will run two workflows on push. [Verify Templating](actions/workflows/verify-templating.yml) checks for uncommitted changes. [GitHub CI](actions/workflows/ci.yml) builds and tests all of the container images.
102+
5. GitHub Actions will run two workflows on push. [Verify Templating](../../actions/workflows/verify-templating.yml) checks for uncommitted changes. [GitHub CI](../../actions/workflows/ci.yml) builds and tests all of the container images.
99103

100104
6. If both workflows complete successfully, generate a new [Docker Official Images](https://github.com/docker-library/official-images/) library entry by running the following command:
101105
```bash

generate-stackbrew-library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -Eeuo pipefail
33

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

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

versions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"8.1": {
3-
"python_version": "3.10",
2+
"8.2": {
3+
"python_version": "3.11",
44
"variants": [
55
"bullseye",
66
"alpine3.16"
77
],
8-
"version": "8.1.1"
8+
"version": "8.2.0"
99
}
1010
}

0 commit comments

Comments
 (0)