You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This is the source repository of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`satosa`](https://hub.docker.com/_/satosa/).
4
4
5
-
This is the Git repo of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`satosa`](https://hub.docker.com/_/satosa/). See [the Docker Hub page](https://hub.docker.com/_/satosa/) for the full readme on how to use this Docker image and for information regarding contributing and issues.
5
+
The image description on Docker Hub is generated from [the docker-library/docs repository](https://github.com/docker-library/docs), specifically [the `satosa` directory](https://github.com/docker-library/docs/tree/master/satosa).
6
6
7
-
The [full image description on Docker Hub](https://hub.docker.com/_/satosa/) is generated/maintained over in [the docker-library/docs repository](https://github.com/docker-library/docs), specifically in [the `satosa` directory](https://github.com/docker-library/docs/tree/master/satosa).
7
+
## See a change merged here that hasn't shown up on Docker Hub?
8
8
9
-
## See a change merged here that doesn't show up on Docker Hub yet?
9
+
For more information about the Docker "Official Images" change lifecycle, see [the "An image's source changed in Git, now what?" FAQ entry](https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what).
10
10
11
-
For more information about the full official images change lifecycle, see [the "An image's source changed in Git, now what?" FAQ entry](https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what).
12
-
13
-
For outstanding `satosa` image PRs, check [PRs with the "library/satosa" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fsatosa). For the current "source of truth" for [`satosa`](https://hub.docker.com/_/satosa/), see [the `library/satosa` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/satosa).
11
+
For outstanding `satosa` image PRs, check [PRs with the "library/satosa" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fsatosa). For the current "source of truth" for the `satosa` image, see [the `library/satosa` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/satosa).
14
12
15
13
---
16
14
@@ -22,4 +20,62 @@ For outstanding `satosa` image PRs, check [PRs with the "library/satosa" label o
22
20
|[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/satosa/)|[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/satosa/)|[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/satosa/)|[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/satosa/)|
23
21
|[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/satosa/)|[](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/satosa/)|
24
22
25
-
<!-- THIS FILE IS GENERATED BY https://github.com/docker-library/docs/blob/master/generate-repo-stub-readme.sh -->
23
+
---
24
+
25
+
## Git Commit Messages
26
+
27
+
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:
28
+
-**docker-entrypoint**: the Dockerfile ENTRYPOINT scripts; currently only [docker-entrypoint.sh](docker-entrypoint.sh)
29
+
-**docker-library**: the Docker Official Images library entry generator; currently only [generate-stackbrew-library.sh](generate-stackbrew-library.sh)
30
+
-**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)
31
+
-**dockerfile-windows**: currently unused
32
+
-**git**: Git repository configuration or GitHub-specific files; includes [.gitignore](.gitignore), [.gitattributes](.gitattributes), and [the GitHub Actions workflows](.github/workflows)
33
+
-**license**: software licensing information; currently only [LICENSE.md](LICENSE.md)
34
+
-**readme**: this file
35
+
-**templating**: the gawk/jq-based templating engine itself, as opposed to the templates; currently only [apply-templates.sh](apply-templates.sh)
36
+
-**update**: a helper script that executes both the version tracker and templating engine; currently only [update.sh](update.sh)
37
+
-**versions**: the SATOSA version tracker; includes [versions.sh](versions.sh) and [versions.json](versions.json)
38
+
39
+
## Update Process
40
+
41
+
1. If necessary, update the list of version aliases at the beginning of `generate-stackbrew-library.sh`.
42
+
43
+
2. Update `versions.json` and the container image definitions by running `update.sh`. Specify the desired major and minor version of SATOSA. For example:
44
+
```bash
45
+
./update.sh 8.1
46
+
```
47
+
48
+
3. If necessary, remove outdated versions of SATOSA or the base container images from `versions.json`. Delete the corresponding SATOSA container image definitions, e.g., `8.0/`, `8.1/*alpine3.14*/`.
49
+
50
+
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:
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.
64
+
65
+
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:
66
+
```bash
67
+
./generate-stackbrew-library.sh
68
+
```
69
+
70
+
7. Fork and edit [the Docker Official Images library entry for SATOSA](https://github.com/docker-library/official-images/edit/master/library/satosa). Replace its contents with the output of `generate-stackbrew-library.sh`. Use a commit message referencing the release announcement. Submit a pull request when done. For example:
0 commit comments