Skip to content

Commit 8807ecc

Browse files
authored
Merge pull request #211 from pdsinterop/ci/update-cookies-docker
Update cookies docker hash
2 parents 5daf9f7 + 0862b03 commit 8807ecc

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/solid-tests-suites.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Solid Test Suites
44
env:
55
# Docker Hub digest (i.e. hash) of the used Docker Images that do not have a version tag.
66
PUBSUB_TAG: latest@sha256:b73a2a5c98d2005bb667dfc69d1c859d704366024298b9caa24ea2e182c456c2
7-
COOKIE_TAG: latest@sha256:c71a3947f97d96ce09823743182582e0d919738be0d4ef5c8c55a9c22c615b91
7+
COOKIE_TAG: latest@sha256:b2815496a1291a8f0f8bf2524c42d6000a4a1d6a202b319fe01e1afacf1cec7d
88

99
on:
1010
push:

run-solid-test-suite.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -e
44

5+
: "${COOKIE_TAG:=latest@sha256:b2815496a1291a8f0f8bf2524c42d6000a4a1d6a202b319fe01e1afacf1cec7d}"
6+
57
# Note that .github/workflows/solid-tests-suites.yml does not use this, this function is just for manual runs of this script.
68
# You can pick different values for the NEXTCLOUD_VERSION build arg, as required:
79
function setup {
@@ -10,7 +12,7 @@ function setup {
1012

1113
docker network create testnet
1214

13-
docker pull michielbdejong/nextcloud-cookie
15+
docker pull "michielbdejong/nextcloud-cookie:${COOKIE_TAG}"
1416
docker pull solidtestsuite/solid-crud-tests:v7.0.5
1517
docker pull solidtestsuite/web-access-control-tests:v7.1.0
1618
docker pull solidtestsuite/webid-provider-tests:v2.1.1
@@ -46,7 +48,12 @@ function startSolidNextcloud {
4648
docker exec -u www-data -i -e SERVER_ROOT="https://$1" "$1" sh /init.sh
4749
docker exec -u root -i "$1" service apache2 reload
4850
echo Getting cookie for "$1"...
49-
export COOKIE_$1="$(docker run --cap-add=SYS_ADMIN --network=testnet --env-file "./env-vars-$1.list" michielbdejong/nextcloud-cookie)"
51+
export COOKIE_$1="$(docker run \
52+
--cap-add=SYS_ADMIN \
53+
--network=testnet \
54+
--env-file "./env-vars-$1.list" \
55+
"michielbdejong/nextcloud-cookie:${COOKIE_TAG}"
56+
)"
5057
}
5158

5259
function runTests {

0 commit comments

Comments
 (0)