diff --git a/8.1/alpine3.16/Dockerfile b/8.2/alpine3.16/Dockerfile similarity index 97% rename from 8.1/alpine3.16/Dockerfile rename to 8.2/alpine3.16/Dockerfile index b45571a..bc54f03 100644 --- a/8.1/alpine3.16/Dockerfile +++ b/8.2/alpine3.16/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.10-alpine3.16 +FROM python:3.11-alpine3.16 # runtime dependencies RUN set -eux; \ @@ -21,7 +21,7 @@ RUN set -eux; \ yq \ ; -ENV SATOSA_VERSION 8.1.1 +ENV SATOSA_VERSION 8.2.0 RUN set -eux; \ apk add --no-cache --virtual .build-deps \ bluez-dev \ diff --git a/8.1/alpine3.16/docker-entrypoint.sh b/8.2/alpine3.16/docker-entrypoint.sh similarity index 97% rename from 8.1/alpine3.16/docker-entrypoint.sh rename to 8.2/alpine3.16/docker-entrypoint.sh index 762a17b..a2f5144 100755 --- a/8.1/alpine3.16/docker-entrypoint.sh +++ b/8.2/alpine3.16/docker-entrypoint.sh @@ -123,6 +123,8 @@ function docker_create_config() { } function docker_pprint_metadata() { + if [ \( ! -f backend.key \) -o \( ! -f backend.crt \) -o -f backend.xml -o -f frontend.xml ]; then return; fi + # use the SAML2 backend keymat to temporarily sign the generated metadata touch backend.xml frontend.xml satosa-saml-metadata proxy_conf.yaml backend.key backend.crt diff --git a/8.1/bullseye/Dockerfile b/8.2/bullseye/Dockerfile similarity index 96% rename from 8.1/bullseye/Dockerfile rename to 8.2/bullseye/Dockerfile index 831bad8..a09d391 100644 --- a/8.1/bullseye/Dockerfile +++ b/8.2/bullseye/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.10-slim-bullseye +FROM python:3.11-slim-bullseye # runtime dependencies RUN set -eux; \ @@ -21,7 +21,7 @@ RUN set -eux; \ yq \ ; -ENV SATOSA_VERSION 8.1.1 +ENV SATOSA_VERSION 8.2.0 RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ diff --git a/8.1/bullseye/docker-entrypoint.sh b/8.2/bullseye/docker-entrypoint.sh similarity index 97% rename from 8.1/bullseye/docker-entrypoint.sh rename to 8.2/bullseye/docker-entrypoint.sh index 762a17b..a2f5144 100755 --- a/8.1/bullseye/docker-entrypoint.sh +++ b/8.2/bullseye/docker-entrypoint.sh @@ -123,6 +123,8 @@ function docker_create_config() { } function docker_pprint_metadata() { + if [ \( ! -f backend.key \) -o \( ! -f backend.crt \) -o -f backend.xml -o -f frontend.xml ]; then return; fi + # use the SAML2 backend keymat to temporarily sign the generated metadata touch backend.xml frontend.xml satosa-saml-metadata proxy_conf.yaml backend.key backend.crt diff --git a/README.md b/README.md index 9b9e09d..d571dff 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Please follow the style of the other Docker Official Images. In particular, use 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: - **docker-entrypoint**: the Dockerfile ENTRYPOINT scripts; currently only [docker-entrypoint.sh](docker-entrypoint.sh) - **docker-library**: the Docker Official Images library entry generator; currently only [generate-stackbrew-library.sh](generate-stackbrew-library.sh) -- **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) +- **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** - **dockerfile-windows**: currently unused - **git**: Git repository configuration or GitHub-specific files; includes [.gitignore](.gitignore), [.gitattributes](.gitattributes), and [the GitHub Actions workflows](.github/workflows) - **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 Use [qemu-user-static](https://github.com/multiarch/qemu-user-static) to work with multi-architecture containers. +In forks of this repository, enable both GitHub Actions and the GitHub CI workflow after reviewing the workflow definitions. + +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`. + ## Update Process 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 Cf. https://www.alpinelinux.org/posts/Alpine-3.16.0-released.html ``` -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. +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. 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: ```bash diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6deaec7..4b70862 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [8.1]='8 latest' + [8.2]='8 latest' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index bbe163a..3c5ab23 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { - "8.1": { - "python_version": "3.10", + "8.2": { + "python_version": "3.11", "variants": [ "bullseye", "alpine3.16" ], - "version": "8.1.1" + "version": "8.2.0" } }