Skip to content

Updated Docker Image versions. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 16, 2021
Merged

Updated Docker Image versions. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94c4a0e
Updated Docker Image versions.
Nov 10, 2021
87211ff
Merge branch 'main' into update-docker-image-10nov
Nov 10, 2021
af0c8d3
Updated CIM Mapping image to fix bug.
Nov 11, 2021
b03734a
Updated CIM Mapping image to fix bug.
Nov 11, 2021
20dbdf5
Update to latest OpenSCD Image and updated Robot Tests.
Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ docker-compose down -v

The option '-v' also removes the volumes created, so all data is lost with this option.

### Known issue with Docker Compose

Using the current configuration with Keycloak and OpenResty (lua-resty-session) sometimes gives an error "**state from argument does not match state restored from session**".
This mostly happens after using logout or the session is expired. The login page is shown, but after login this error is shown.
Just open the url [http://localhost/](http://localhost/) again and OpenSCD is shown again also being logged in.

## Keycloak Demo Configuration
For demo purposes, a [demo Keycloak configuration](compas/keycloak/keycloak_compas_realm.json) is created which can be imported when
running a Keycloak instance.
Expand Down
6 changes: 3 additions & 3 deletions compas/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
scl-data-service:
labels:
compas: true
image: "lfenergy/compas-scl-data-service:0.8.2"
image: "lfenergy/compas-scl-data-service:0.8.3"
environment:
- BASEX_HOST=basex
- BASEX_PORT=1984
Expand All @@ -63,7 +63,7 @@ services:
cim-mapping:
labels:
compas: true
image: "lfenergy/compas-cim-mapping:0.7.4"
image: "lfenergy/compas-cim-mapping:0.7.6"
environment:
- JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs
- JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas
Expand All @@ -81,7 +81,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.7.1-compas-1"
image: "lfenergy/compas-open-scd:v0.7.1-compas-3"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/"]
interval: 30s
Expand Down
9 changes: 4 additions & 5 deletions integration-testing/TestSuite002-versions-compas.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ TestCase002-30
# Next select the first version from the list and compare this to the current open edited version.
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(5) >> text=Substation
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(3) >> text=Substation
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

TestCase002-31
Expand Down Expand Up @@ -195,11 +195,10 @@ TestCase002-32
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(4) >> text=Substation
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list:nth-child(1) > mwc-list-item:nth-child(3) >> text=Substation
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed


TestCase002-33
[Documentation] Compare versions from CoMPAS not selecting correct number of versions
Initialize Versions True
Expand Down
2 changes: 1 addition & 1 deletion integration-testing/TestSuite003-cim-mapping.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Open Project from CIM
[Arguments] ${name} ${scltype}
${promise}= Promise To Upload File ${CURDIR}/test-files/${name}.xml
Open Menu Project from CIM
${upload_result}= Wait For ${promise}
${upload_result}= Wait For ${promise}
Sleep 0.5s Wait until loading file starts.
Check Title Filename ${name} ${scltype}
Close Menu
Expand Down