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
## A few parts of this project are not in the public domain.
2
2
3
-
### Files licensed under the MIT License
3
+
### Files Licensed Under the MIT License
4
4
5
-
Several scripts are adapted from their counterparts in the [Docker Official Image for Python](https://github.com/docker-library/python) (`versions.sh`, `apply-templates.sh`, `update.sh`, `generate-stackbrew-library.sh`, `.github/workflows/ci.yml`, `.github/workflows/verify-templating.yml`) and the [Docker Official Image for PostgreSQL](https://github.com/docker-library/postgres) (`docker-entrypoint.sh`), both provided by Docker, Inc., under the terms of the MIT License.
5
+
Several scripts are adapted from their counterparts in the
6
+
[Docker Official Image for Python](https://github.com/docker-library/python)
`.github/workflows/verify-templating.yml`) and the
10
+
[Docker Official Image for PostgreSQL](https://github.com/docker-library/postgres)
11
+
(`docker-entrypoint.sh`), both provided by Docker, Inc., under the
12
+
terms of the MIT License.
6
13
7
14
## The rest of this project is in the worldwide public domain.
8
15
9
-
As a work of the United States Government, this project is in the public domain within the United States.
16
+
As a work of the United States Government, this project is in the
17
+
public domain within the United States.
10
18
11
-
Additionally, we waive copyright and related rights in the work worldwide through the CC0 1.0 Universal public domain dedication.
19
+
Additionally, we waive copyright and related rights in the work
20
+
worldwide through the CC0 1.0 Universal public domain dedication.
12
21
13
22
## CC0 1.0 Universal Summary
14
23
15
-
This is a human-readable summary of the [Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
24
+
This is a human-readable summary of the
25
+
[Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
16
26
17
27
### No Copyright
18
28
19
-
The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
29
+
The person who associated a work with this deed has dedicated the work
30
+
to the public domain by waiving all of his or her rights to the work
31
+
worldwide under copyright law, including all related and neighboring
32
+
rights, to the extent allowed by law.
20
33
21
-
You can copy, modify, distribute, and perform the work, even for commercial purposes, all without asking permission.
34
+
You can copy, modify, distribute, and perform the work, even for
35
+
commercial purposes, all without asking permission.
22
36
23
37
### Other Information
24
38
25
-
In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
39
+
In no way are the patent or trademark rights of any person affected by
40
+
CC0, nor are the rights that other persons may have in the work or in
41
+
how the work is used, such as publicity or privacy rights.
26
42
27
-
Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.
28
-
When using or citing the work, you should not imply endorsement by the author or the affirmer.
43
+
Unless expressly stated otherwise, the person who associated a work
44
+
with this deed makes no warranties about the work, and disclaims
45
+
liability for all uses of the work, to the fullest extent permitted by
46
+
applicable law. When using or citing the work, you should not imply
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/).
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).
7
+
The image description on Docker Hub is generated from
## See a change merged here that hasn't shown up on Docker Hub?
8
13
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).
14
+
For more information about the Docker "Official Images" change
15
+
lifecycle, see
16
+
[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
17
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).
18
+
For outstanding `satosa` image PRs, check
19
+
[PRs with the "library/satosa" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fsatosa). For
20
+
the current "source of truth" for the `satosa` image, see
21
+
[the `library/satosa` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/satosa).
12
22
13
23
---
14
24
15
-
-[](https://github.com/IdentityPython/satosa-docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amain)
25
+
-[](https://github.com/IdentityPython/satosa-docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amain)
16
26
17
27
| Build | Status | Badges | (per-arch) |
18
28
|:-:|:-:|:-:|:-:|
@@ -24,37 +34,62 @@ For outstanding `satosa` image PRs, check [PRs with the "library/satosa" label o
24
34
25
35
# Contributing
26
36
27
-
This project uses the [Git feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow). Please submit your changes for review as a [GitHub pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests).
In forks of this repository, enable the GitHub Actions workflows. GitHub Actions runs two workflows when developers push commits to a branch. [Verify Templating](actions/workflows/verify-templating.yml) checks for uncommitted changes. [GitHub CI](actions/workflows/ci.yml) builds and tests the container images.
42
+
In forks of this repository, enable the GitHub Actions
43
+
workflows. GitHub Actions runs two workflows when developers push
for uncommitted changes. [GitHub CI](actions/workflows/ci.yml) builds
47
+
and tests the container images.
30
48
31
49
## Development Environment
32
50
33
51
This project uses the following software:
34
52
35
-
-[Docker 20.10 or newer](https://docs.docker.com/engine/install/)
53
+
-[Docker 20.10 or newer](https://docs.docker.com/engine/install/);
36
54
37
-
-[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/), for the templating engine and version tracker
to test containers on other hardware architecture via emulation
46
73
47
-
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`.
74
+
Before cloning the repository or working within it, set the
75
+
[file mode creation mask](https://en.wikipedia.org/wiki/Umask) to
76
+
`0022` or `u=rwx,g=rx,o=rx`.
48
77
49
78
## Coding Style
50
79
51
-
Follow [the Docker Official Images review guidelines](https://github.com/docker-library/official-images#review-guidelines) and [Dockerfile best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/).
80
+
Follow
81
+
[the Docker Official Images review guidelines](https://github.com/docker-library/official-images#review-guidelines)
82
+
and
83
+
[Dockerfile best practices](https://docs.docker.com/develop/develop-images/dockerfile_best-practices/).
52
84
53
-
In Dockerfiles and shell scripts, please use tabs for indentation instead of spaces.
85
+
In Dockerfiles and shell scripts, please use tabs for indentation
86
+
instead of spaces.
54
87
55
88
## Commit Messages
56
89
57
-
This project uses [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Valid commit types are:
-**build**—changes to the build system or external dependencies
60
95
@@ -68,7 +103,8 @@ This project uses [Conventional Commits 1.0.0](https://www.conventionalcommits.o
68
103
69
104
-**perf**—a code change that improves performance
70
105
71
-
-**refactor**—a code change that neither fixes a bug nor adds a feature
106
+
-**refactor**—a code change that neither fixes a bug nor adds a
107
+
feature
72
108
73
109
-**test**—new tests or corrections to existing tests
74
110
@@ -78,52 +114,63 @@ No commit scopes are currently in use.
78
114
79
115
In a fork of this repository:
80
116
81
-
1. Review the list of version aliases at the beginning of `generate-stackbrew-library.sh`.
117
+
1. Review the list of version aliases at the beginning of
118
+
`generate-stackbrew-library.sh`.
82
119
83
-
2. Run [update.sh](update.sh), specifying the desired major and minor version of SATOSA. For example:
120
+
2. Run [update.sh](update.sh), specifying the desired major and minor
121
+
version of SATOSA. For example:
84
122
85
123
```bash
86
124
./update.sh 8.1
87
125
```
88
126
89
-
3. Remove outdated versions of SATOSA or base container images from `versions.json`, and delete the corresponding SATOSA container image definitions from the repository, e.g., the `8.0/` or `8.1/*alpine3.14*/` folders.
127
+
3. Remove outdated versions of SATOSA or base container images from
128
+
`versions.json`, and delete the corresponding SATOSA container
129
+
image definitions from the repository, e.g., the `8.0/` or
130
+
`8.1/*alpine3.14*/` folders.
90
131
91
-
4. Mention the new SATOSA or base container version in the commit message subject, reference the release announcement in the commit message body. For example:
132
+
4. Mention the new SATOSA or base container version in the commit
133
+
message subject, reference the release announcement in the commit
5. Submit a pull request after both GitHub Actions workflows complete successfully.
150
+
5. Submit a pull request after both GitHub Actions workflows complete
151
+
successfully.
108
152
109
-
After accepting a pull request, fork and edit [the Docker Official Images library entry for SATOSA](https://github.com/docker-library/official-images/edit/master/library/satosa):
153
+
After accepting a pull request, fork and edit
154
+
[the Docker Official Images library entry for SATOSA](https://github.com/docker-library/official-images/edit/master/library/satosa):
110
155
111
-
1. Replace its contents with the output of [generate-stackbrew-library.sh](generate-stackbrew-library.sh).
156
+
1. Replace that file's contents with the output of
0 commit comments