Skip to content

Commit

Permalink
chore: renames iris-app-api-demo to demo-checkin-app at various
Browse files Browse the repository at this point in the history
forgotten places
  • Loading branch information
jekutzsche committed May 22, 2021
1 parent b067e08 commit d61d07a
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/demo-checkin-app.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#build-image

name: Build and package image for iris-app-api-demo and deploy it to docker.io
# Build and package image for demo-checkin-app and deploy it to docker.io
name: demo-checkin-app Develop

on:
push:
Expand Down
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ $ ./mvnw spring-boot:run -PlocalDev -am -pl iris-location-service <4>
# in a third console
$ cd iris <2>
$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-app-api-demo <5>
$ ./mvnw spring-boot:run -PlocalDev -am -pl demo-checkin-app <5>
# in a fourth console
$ cd iris <2>
$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-api-generator,iris-client-sormas-sidecar <6>
$ ./mvnw spring-boot:run -PlocalDev -am -pl iris-api-generator,iris-client-bff <6>
----
<1> Clone the repository.
<2> Switch to the root directory.
Expand Down Expand Up @@ -89,9 +89,9 @@ fi
$tab"cd IRIS/iris-public-server && mvn clean && ./mvnw spring-boot:run -PlocalDev -am$end"
$tab"cd IRIS/iris-location-service && mvn clean && sleep 5 && ./mvnw spring-boot:run -PlocalDev -am$end"
$tab"cd IRIS && sleep 10 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-app-api-demo$end"
$tab"cd IRIS && sleep 10 && ./mvnw spring-boot:run -PlocalDev -am -pl demo-checkin-app$end"
$tab"cd IRIS && sleep 15 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-client-sormas-sidecar$end"
$tab"cd IRIS && sleep 15 && ./mvnw spring-boot:run -PlocalDev -am -pl iris-client-bff$end"
if [[ $* == *--fe* ]]
then
$tab"cd iris-client-frontend && sleep 15 && npm run serve$end"
Expand Down
2 changes: 1 addition & 1 deletion demo-checkin-app/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ server.port=8091
server.ssl.key-store-type=PKCS12
server.ssl.key-store=classpath:keystore.p12
server.ssl.key-store-password=irisapp
server.ssl.key-alias=iris-app-api-demo
server.ssl.key-alias=demo-checkin-app

logging.level.org.apache.http=INFO
spring.output.ansi.enabled=ALWAYS
Expand Down
Binary file modified demo-checkin-app/src/main/resources/keystore.p12
Binary file not shown.
4 changes: 2 additions & 2 deletions infrastructure/docker-compose-all.staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ services:
iris-client:
condition: service_started

iris-app-api-demo:
image: inoeg/iris-app-api-demo:${IRIS_VERSION}
demo-checkin-app:
image: inoeg/demo-checkin-app:${IRIS_VERSION}
depends_on:
iris-location:
condition: service_started
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/docker-compose-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ services:
depends_on:
- iris-client

iris-app-api-demo:
image: inoeg/iris-app-api-demo:${IRIS_VERSION}
demo-checkin-app:
image: inoeg/demo-checkin-app:${IRIS_VERSION}
depends_on:
iris-location:
condition: service_started
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/docker-compose.staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ services:
iris-client:
condition: service_started

iris-app-api-demo:
image: inoeg/iris-app-api-demo:${IRIS_VERSION}
demo-checkin-app:
image: inoeg/demo-checkin-app:${IRIS_VERSION}
depends_on:
iris-location:
condition: service_started
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ services:
depends_on:
- iris-client

iris-app-api-demo:
image: inoeg/iris-app-api-demo:${IRIS_VERSION}
demo-checkin-app:
image: inoeg/demo-checkin-app:${IRIS_VERSION}
depends_on:
iris-location:
condition: service_started
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ springdoc.api-docs.enabled=true
logging.level.iris=DEBUG

providers.providers.[0].id=f002f370-bd54-4325-ad91-1aff3bf730a5
providers.providers.[0].data-request-endpoint=https://iris-app-api-demo:8091/api/iris/data-request
providers.providers.[0].data-request-endpoint=https://demo-checkin-app:8091/api/iris/data-request

providers.providers.[1].id=bcf054fd-c904-484a-acdb-798e151c5142
providers.providers.[1].data-request-endpoint=https://staging.iris.smartmeeting.online/api/services/iris/v1/data-request

0 comments on commit d61d07a

Please sign in to comment.