Skip to content

Commit 07ce67c

Browse files
committed
feat!: drop support for platforms other than linux/amd64 and linux/arm64
I am unable to determine why [cryptography](https://cryptography.io/) won't build on other platforms. Closes #15.
1 parent 8420c19 commit 07ce67c

File tree

2 files changed

+10
-30
lines changed

2 files changed

+10
-30
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ For the current "source of truth" for the `satosa` image, see
2525
---
2626

2727
[![build status badge](https://img.shields.io/github/workflow/status/IdentityPython/satosa-docker/GitHub%20CI/main?label=GitHub%20CI)](https://github.com/IdentityPython/satosa-docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amain)
28-
29-
| Build | Status | Badges | (per-arch) |
30-
|:-:|:-:|:-:|:-:|
31-
| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/satosa.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/satosa/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/satosa.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/satosa/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/satosa.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/satosa/) | [![riscv64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/riscv64/job/satosa.svg?label=riscv64)](https://doi-janky.infosiftr.net/job/multiarch/job/riscv64/job/satosa/) |
32-
| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/satosa.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/satosa/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/satosa.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/satosa/) | | |
28+
[![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/satosa.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/satosa/)
29+
[![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/satosa.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/satosa/)
30+
[![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/satosa.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/satosa/)
3331

3432
---
3533

generate-stackbrew-library.sh

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -130,36 +130,18 @@ for version; do
130130
variantAliases=( "${variantAliases[@]//latest-/}" )
131131

132132
case "$v" in
133-
windows/*)
134-
variantArches='windows-amd64'
135-
;;
136-
137133
*)
138-
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")"
139-
variantArches="${parentRepoToArches[$variantParent]}"
140-
# https://github.com/IdentityPython/satosa-docker/issues/11
141-
variantArches="$(sed <<<" $variantArches " -e 's/ *arm32.. */ /g')"
142-
variantArches="$(sed <<<" $variantArches " -e 's/ i386 / /')"
143-
;;
144-
esac
145-
146-
case "$v" in
147-
alpine*)
148-
# https://github.com/IdentityPython/satosa-docker/issues/1
149-
variantArches="$(sed <<<" $variantArches " -e 's/ s390x / /')"
134+
# The cryptography library isn't well
135+
# supported on other architectures, so
136+
# give up on them for now;
137+
# cf. IdentityPython/satosa-docker#15.
138+
variantArches="amd64 arm64v8"
150139
;;
151140
esac
152141

153142
sharedTags=()
154-
for windowsShared in windowsservercore nanoserver; do
155-
if [[ "$variant" == "$windowsShared"* ]]; then
156-
sharedTags=( "${versionAliases[@]/%/-$windowsShared}" )
157-
sharedTags=( "${sharedTags[@]//latest-/}" )
158-
break
159-
fi
160-
done
161-
162-
if [ "$variant" = "$defaultDebianVariant" ] || [[ "$variant" == 'windowsservercore'* ]]; then
143+
144+
if [ "$variant" = "$defaultDebianVariant" ]; then
163145
sharedTags+=( "${versionAliases[@]}" )
164146
fi
165147

0 commit comments

Comments
 (0)