Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 94862fd

Browse files
author
Corneil du Plessis
committed
Updates src/local/README.md with information on the scripts.
Removes create-containers.sh that used jib Adds comment to application-dataflow-keycloak.yaml on client-secret.
1 parent 7e0244c commit 94862fd

5 files changed

+18
-72
lines changed

src/local/README.md

+14-7
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor
1212
Usage: `download-apps.sh [version]`
1313
* `version` is the dataflow-server version like `2.10.3`. Default is `2.11.3-SNAPSHOT`
1414

15-
## `create-containers.sh`
16-
Creates all containers and pushes to local docker registry.
15+
## `launch-dataflow.sh`
16+
Uses docker compose to launch a database, broker, skipper and dataflow server.
1717

18-
This script requires [jib-cli](https://github.com/GoogleContainerTools/jib/tree/master/jib-cli)
18+
## `launch-with-keycloak.sh`
19+
Uses docker compose to launch a database, broker, skipper and dataflow server and a Keycloak server that loads the `dataflow` realm from `./src/local/data` which define a single user named `joe` with password `password`
1920

20-
Usage: `create-containers.sh [version] [jre-version]`
21-
* `version` is the dataflow-server version like `2.9.6`. Default is `2.11.3-SNAPSHOT`
22-
* `jre-version` should be one of 11, 17. Default is 11
21+
## `stop-dataflow.sh`
22+
Stops docker-compose and all running Java instances based on the pid files.
2323

24+
## `launch-keycloak.sh`
25+
Launches standalone Keycloak and loads the dataflow realm from `./src/local/data` which define a single user named `joe` with password `password`
26+
27+
## `tail-container-log.sh`
28+
Finds a container with provided name and tails the stdout of the container.
2429

2530
## Testing with Keycloak
2631
### Build with Java 17
@@ -39,4 +44,6 @@ Arguments: `--spring.cloud.dataflow.features.streams-enabled=false --spring.clou
3944

4045
### Run
4146

42-
java -jar spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-3.0.0-SNAPSHOT.jar --spring.cloud.dataflow.features.streams-enabled=false --spring.cloud.dataflow.features.tasks-enabled=true --spring.cloud.dataflow.features.schedules-enabled=false --spring.config.additional-location="src/local/application-dataflow-keycloak.yaml"
47+
```shell
48+
java -jar spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-3.0.0-SNAPSHOT.jar --spring.cloud.dataflow.features.streams-enabled=false --spring.cloud.dataflow.features.tasks-enabled=true --spring.cloud.dataflow.features.schedules-enabled=false --spring.config.additional-location="src/local/application-dataflow-keycloak.yaml"
49+
```

src/local/application-dataflow-keycloak.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ spring:
3131
redirect-uri: '{baseUrl}/login/oauth2/code/{registrationId}'
3232
client-id: 'dataflow'
3333
client-name: 'dataflow'
34+
# aligns with the realm imported from the data directory
3435
client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
3536
provider: 'keycloak'
3637
authorization-grant-type: 'authorization_code'
@@ -41,6 +42,7 @@ spring:
4142
opaquetoken:
4243
introspection-uri: http://localhost:8080/realms/dataflow/protocol/openid-connect/token/introspect
4344
client-id: 'dataflow'
45+
# aligns with the realm imported from the data directory
4446
client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
4547

4648
logging:

src/local/application-skipper-keycloak.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ spring:
3131
redirect-uri: '{baseUrl}/login/oauth2/code/{registrationId}'
3232
client-id: 'dataflow'
3333
client-name: 'dataflow'
34+
# aligns with the realm imported from the data directory
3435
client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'
3536
provider: 'keycloak'
3637
authorization-grant-type: 'authorization_code'
@@ -41,4 +42,5 @@ spring:
4142
opaquetoken:
4243
introspection-uri: http://localhost:8080/realms/dataflow/protocol/openid-connect/token/introspect
4344
client-id: 'dataflow'
45+
# aligns with the realm imported from the data directory
4446
client-secret: '090RucamvekrMLyGHMr4lkHX9xhAlsqK'

src/local/create-containers.sh

-64
This file was deleted.

src/local/launch-with-keycloak.sh

-1
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,4 @@ echo "$!" > dataflow.pid
8989
echo "Waiting for Data Flow Server"
9090
wget --retry-connrefused --read-timeout=20 --timeout=15 --tries=10 --continue -q http://localhost:9393
9191
echo "Data flow running"
92-
# docker run -v ${SCDIR}/data:/opt/keycloak/data/import -p 8080:8080 -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin keycloak/keycloak:25.0 start-dev --import-realm --verbose
9392
fi

0 commit comments

Comments
 (0)