Skip to content

Commit 37f4d2b

Browse files
3breadt3breadt
committed
Adjust pipelines, license and readme for the forked version
1 parent 556d4b7 commit 37f4d2b

File tree

7 files changed

+112
-109
lines changed

7 files changed

+112
-109
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@ name: CI
22
on:
33
push:
44
branches:
5-
- master
5+
- master
66
tags:
7-
- "!*"
7+
- "!*"
88
pull_request:
99

1010
jobs:
1111
test:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
15-
- name: Install dgoss
16-
run: |
17-
curl -sfL https://goss.rocks/install | sudo sh
18-
- name: Set up QEMU
19-
uses: docker/setup-qemu-action@v3
20-
- name: Set up Docker Buildx
21-
uses: docker/setup-buildx-action@v3
22-
- name: Run test
23-
run: |
24-
for platform in ${PLATFORMS}; do
25-
echo "Testing ${platform}"
26-
make build PLATFORM="${platform}"
27-
docker images
28-
make test PLATFORM="${platform}"
29-
done
30-
env:
31-
PLATFORMS: linux/amd64 linux/arm64
14+
- uses: actions/checkout@v4
15+
- name: Install dgoss
16+
run: |
17+
curl -sfL https://goss.rocks/install | sudo sh
18+
- name: Set up QEMU
19+
uses: docker/setup-qemu-action@v3
20+
- name: Set up Docker Buildx
21+
uses: docker/setup-buildx-action@v3
22+
- name: Run test
23+
run: |
24+
for platform in ${PLATFORMS}; do
25+
echo "Testing ${platform}"
26+
make build PLATFORM="${platform}"
27+
docker images
28+
make test PLATFORM="${platform}"
29+
done
30+
env:
31+
PLATFORMS: linux/amd64 linux/arm64
3232

3333
lint:
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v4
37-
- uses: hadolint/[email protected]
36+
- uses: actions/checkout@v4
37+
- uses: hadolint/[email protected]

‎.github/workflows/release-develop.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@ name: Release docker image as develop
22
on:
33
push:
44
branches:
5-
- master
5+
- master
66

77
jobs:
88
release-image-to-github:
99
name: Release image to GitHub
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- name: Set up QEMU
14-
uses: docker/setup-qemu-action@v3
15-
- name: Set up Docker Buildx
16-
uses: docker/setup-buildx-action@v3
17-
- name: Build and Push to GitHub
18-
run: |
19-
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
20-
make release RELEASE_TAGS="develop"
21-
env:
22-
REGISTRY_HOST: ghcr.io
23-
REGISTRY_USERNAME: ${{ github.repository_owner }}
24-
REGISTRY_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
12+
- uses: actions/checkout@v4
13+
- name: Set up QEMU
14+
uses: docker/setup-qemu-action@v3
15+
- name: Set up Docker Buildx
16+
uses: docker/setup-buildx-action@v3
17+
- name: Build and Push to GitHub
18+
run: |
19+
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
20+
make release RELEASE_TAGS="develop"
21+
env:
22+
REGISTRY_HOST: ghcr.io
23+
REGISTRY_USERNAME: ${{ github.repository_owner }}
24+
REGISTRY_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
2525

2626
release-image-to-docker-hub:
2727
name: Release image to Docker Hub
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v4
31-
- name: Set up QEMU
32-
uses: docker/setup-qemu-action@v3
33-
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v3
35-
- name: Build and Push to Docker Hub
36-
run: |
37-
echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
38-
make release RELEASE_TAGS="develop"
39-
env:
40-
REGISTRY_HOST: index.docker.io
41-
REGISTRY_USERNAME: kenchan0130
42-
REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
30+
- uses: actions/checkout@v4
31+
- name: Set up QEMU
32+
uses: docker/setup-qemu-action@v3
33+
- name: Set up Docker Buildx
34+
uses: docker/setup-buildx-action@v3
35+
- name: Build and Push to Docker Hub
36+
run: |
37+
echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
38+
make release RELEASE_TAGS="develop"
39+
env:
40+
REGISTRY_HOST: index.docker.io
41+
REGISTRY_USERNAME: 3breadt
42+
REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,72 @@ name: Release docker image
22
on:
33
push:
44
branches:
5-
- master
5+
- master
66

77
jobs:
88
check-release:
99
runs-on: ubuntu-latest
1010
outputs:
1111
is_skip: ${{ steps.compare_docker_registory_and_local_repository_version.outputs.is_skip }}
1212
steps:
13-
- uses: actions/checkout@v4
14-
- name: Compare Docker Registory and Local Repository Version
15-
id: compare_docker_registory_and_local_repository_version
16-
run: |
17-
release_version=$(cat .simplesamlphp_version)
18-
echo "Release version is ${release_version}"
19-
if [[ "$( curl -sfL https://registry.hub.docker.com/v2/repositories/kenchan0130/simplesamlphp/tags | jq --arg version "${release_version}" '.results[] | select(.name == $version)' )" ]]; then
20-
echo "${release_version} is already released."
21-
echo "::set-output name=is_skip::true"
22-
else
23-
echo "::set-output name=is_skip::false"
24-
fi
25-
- name: Show is_skip output
26-
run: |
27-
echo 'is_skip: ${{ steps.compare_docker_registory_and_local_repository_version.outputs.is_skip }}'
13+
- uses: actions/checkout@v4
14+
- name: Compare Docker Registory and Local Repository Version
15+
id: compare_docker_registory_and_local_repository_version
16+
run: |
17+
release_version=$(cat .simplesamlphp_version)
18+
echo "Release version is ${release_version}"
19+
if [[ "$( curl -sfL https://registry.hub.docker.com/v2/repositories/3breadt/simplesamlphp/tags | jq --arg version "${release_version}" '.results[] | select(.name == $version)' )" ]]; then
20+
echo "${release_version} is already released."
21+
echo "::set-output name=is_skip::true"
22+
else
23+
echo "::set-output name=is_skip::false"
24+
fi
25+
- name: Show is_skip output
26+
run: |
27+
echo 'is_skip: ${{ steps.compare_docker_registory_and_local_repository_version.outputs.is_skip }}'
2828
2929
release-image-to-github:
3030
name: Release image to GitHub
3131
needs: check-release
3232
if: ${{ needs.check-release.outputs.is_skip == 'false' }}
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@v4
36-
- name: Set up QEMU
37-
uses: docker/setup-qemu-action@v3
38-
- name: Set up Docker Buildx
39-
uses: docker/setup-buildx-action@v3
40-
- name: Build and Push to GitHub
41-
run: |
42-
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
43-
make release
44-
env:
45-
REGISTRY_HOST: ghcr.io
46-
REGISTRY_USERNAME: ${{ github.repository_owner }}
47-
REGISTRY_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
35+
- uses: actions/checkout@v4
36+
- name: Set up QEMU
37+
uses: docker/setup-qemu-action@v3
38+
- name: Set up Docker Buildx
39+
uses: docker/setup-buildx-action@v3
40+
- name: Build and Push to GitHub
41+
run: |
42+
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
43+
make release
44+
env:
45+
REGISTRY_HOST: ghcr.io
46+
REGISTRY_USERNAME: ${{ github.repository_owner }}
47+
REGISTRY_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
4848

4949
release-image-to-docker-hub:
5050
name: Release image to Docker Hub
5151
needs: check-release
5252
if: ${{ needs.check-release.outputs.is_skip == 'false' }}
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v4
56-
- name: Set up QEMU
57-
uses: docker/setup-qemu-action@v3
58-
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@v3
60-
- name: Build and Push to Docker Hub
61-
run: |
62-
echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
63-
make release
64-
env:
65-
REGISTRY_HOST: index.docker.io
66-
REGISTRY_USERNAME: kenchan0130
67-
REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
68-
- name: Sync Docker Hub Description
69-
uses: peter-evans/dockerhub-description@v4
70-
env:
71-
DOCKERHUB_USERNAME: kenchan0130
72-
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
73-
DOCKERHUB_REPOSITORY: kenchan0130/simplesamlphp
55+
- uses: actions/checkout@v4
56+
- name: Set up QEMU
57+
uses: docker/setup-qemu-action@v3
58+
- name: Set up Docker Buildx
59+
uses: docker/setup-buildx-action@v3
60+
- name: Build and Push to Docker Hub
61+
run: |
62+
echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
63+
make release
64+
env:
65+
REGISTRY_HOST: index.docker.io
66+
REGISTRY_USERNAME: 3breadt
67+
REGISTRY_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
68+
- name: Sync Docker Hub Description
69+
uses: peter-evans/dockerhub-description@v4
70+
env:
71+
DOCKERHUB_USERNAME: 3breadt
72+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
73+
DOCKERHUB_REPOSITORY: 3breadt/simplesamlphp

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG IMAGE_NAME=unkown
1313
LABEL git-revision=$GIT_REVISION \
1414
git-origin=$GIT_ORIGIN \
1515
image-name=$IMAGE_NAME \
16-
maintainer="Tadayuki Onishi <tt.tanishi100@gmail.com>"
16+
maintainer="Daniel Dreibrodt <daniel.dreibrodt@gmail.com>"
1717

1818
# SimpleSAMLphp
1919
ARG SIMPLESAMLPHP_VERSION

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2019 Tadayuki Onishi <[email protected]>
4+
Copyright (c) 2024 Daniel Dreibrodt <[email protected]>
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy of
67
this software and associated documentation files (the "Software"), to deal in

‎README.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Docker Test SAML 2.0 Identity Provider (IdP)
22

3-
[![](https://img.shields.io/docker/v/kenchan0130/simplesamlphp?sort=semver)](https://hub.docker.com/r/kenchan0130/simplesamlphp)
4-
[![](https://github.com/kenchan0130/docker-simplesamlphp/workflows/CI/badge.svg)](https://github.com/kenchan0130/docker-simplesamlphp/actions?query=workflow%3ACI)
5-
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/kenchan0130/docker-simplesamlphp/blob/master/LICENSE)
3+
[![](https://img.shields.io/docker/v/3breadt/simplesamlphp?sort=semver)](https://hub.docker.com/r/3breadt/simplesamlphp)
4+
[![](https://github.com/3breadt/docker-simplesamlphp/workflows/CI/badge.svg)](https://github.com/3breadt/docker-simplesamlphp/actions?query=workflow%3ACI)
5+
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/3breadt/docker-simplesamlphp/blob/master/LICENSE)
66

77
Docker container with a plug and play SAML 2.0 Identity Provider (IdP) for development and testing.
88

99
Built with [SimpleSAMLphp](https://simplesamlphp.org/). Based on [official PHP8 Apache image](https://hub.docker.com/_/php/).
1010

1111
SimpleSAMLphp is logging to stdout on debug log level. Apache is logging error and access log to stdout.
1212

13-
**You must not use at your production. This is for test.**
13+
**THIS IMAGE IS NOT SUITABLE FOR USE IN PRODUCTION ENVIRONMENTS, USE ONLY FOR TESTING.**
1414

1515
## Usage
1616

@@ -22,7 +22,7 @@ docker run --name=idp \
2222
-e SIMPLESAMLPHP_SP_ENTITY_ID=http://app.example.com \
2323
-e SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-acs.php/test-sp \
2424
-e SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp \
25-
-d kenchan0130/simplesamlphp
25+
-d 3breadt/simplesamlphp
2626
```
2727

2828
### Using docker-compose
@@ -31,7 +31,7 @@ docker run --name=idp \
3131
version: "3"
3232
services:
3333
idp:
34-
image: kenchan0130/simplesamlphp
34+
image: 3breadt/simplesamlphp
3535
container_name: idp
3636
ports:
3737
- "8080:8080"
@@ -125,7 +125,7 @@ docker run --name=idp \
125125
-e SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-acs.php/test-sp \
126126
-e SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp \
127127
-v $PWD/authsources.php:/var/www/simplesamlphp/config/authsources.php \
128-
-d kenchan0130/simplesamlphp
128+
-d 3breadt/simplesamlphp
129129
```
130130

131131
**docker-compose**
@@ -134,7 +134,7 @@ docker run --name=idp \
134134
version: "3"
135135
services:
136136
idp:
137-
image: kenchan0130/simplesamlphp
137+
image: 3breadt/simplesamlphp
138138
container_name: idp
139139
ports:
140140
- "8080:8080"
@@ -173,7 +173,7 @@ If you save this source as `saml20-sp-remote.php`, you can customize IdP users b
173173
docker run --name=idp \
174174
-p 8080:8080 \
175175
-v saml20-sp-remote.php:/var/www/simplesamlphp/metadata/saml20-sp-remote.php \
176-
-d kenchan0130/simplesamlphp
176+
-d 3breadt/simplesamlphp
177177
```
178178

179179
**docker-compose**
@@ -182,7 +182,7 @@ docker run --name=idp \
182182
version: "3"
183183
services:
184184
idp:
185-
image: kenchan0130/simplesamlphp
185+
image: 3breadt/simplesamlphp
186186
container_name: idp
187187
ports:
188188
- "8080:8080"
@@ -192,9 +192,10 @@ services:
192192

193193
For detailed attributes, see [SP remote metadata reference#SAML 2.0 options](https://simplesamlphp.org/docs/stable/simplesamlphp-reference-sp-remote#section_2).
194194

195-
## Inspired By
195+
## Based On
196196

197197
- https://github.com/kristophjunge/docker-test-saml-idp
198+
- https://github.com/3breadt/docker-simplesamlphp
198199

199200
## License
200201

‎docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ services:
1313
SIMPLESAMLPHP_IDP_SECRET_SALT:
1414
ports:
1515
- "8080:8080"
16+
- "8443:8443"

0 commit comments

Comments
 (0)