Skip to content

Commit 09ec988

Browse files
Fix issue starting spring
And add missing configuration
1 parent 9e77e6a commit 09ec988

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

selenium/bin/components/spring

100644100755
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
SPRING_DOCKER_IMAGE=pivotalrabbitmq/spring-authorization-server
3+
SPRING_DOCKER_IMAGE=pivotalrabbitmq/spring-authorization-server:0.0.1
44

55
ensure_spring() {
66
if docker ps | grep spring &> /dev/null; then
@@ -19,7 +19,7 @@ init_spring() {
1919
print "> SPRING_DOCKER_IMAGE: ${SPRING_DOCKER_IMAGE}"
2020

2121
generate-ca-server-client-kpi spring $SPRING_CONFIG_DIR
22-
22+
generate-server-keystore-if-required spring $SPRING_CONFIG_DIR
2323
}
2424
start_spring() {
2525
begin "Starting spring ..."
@@ -30,16 +30,17 @@ start_spring() {
3030
MOUNT_SPRING_CONF_DIR=$CONF_DIR/spring
3131

3232
mkdir -p $MOUNT_SPRING_CONF_DIR
33-
# ${BIN_DIR}/gen-spring-yml ${SPRINGCONFIG_DIR} "test-realm" $ENV_FILE $MOUNT_KEYCLOAK_CONF_DIR/test-realm.json
33+
${BIN_DIR}/gen-spring-yml ${SPRING_CONFIG_DIR} $ENV_FILE $MOUNT_SPRING_CONF_DIR/application.yml
3434
print "> EFFECTIVE SPRING_CONFIG_FILE: $MOUNT_SPRING_CONF_DIR/application.yml"
3535
cp ${SPRING_CONFIG_DIR}/*.pem $MOUNT_SPRING_CONF_DIR
3636

3737
docker run \
3838
--detach \
3939
--name spring \
4040
--net ${DOCKER_NETWORK} \
41-
--publish 8081:8080 \
42-
--publish 8443:8443 \
41+
--publish 8080:8080 \
42+
--publish 8443:8443 \
43+
-v ${MOUNT_SPRING_CONF_DIR}:/config \
4344
-v ${MOUNT_SPRING_CONF_DIR}:/opt/spring/data/import/ \
4445
${SPRING_DOCKER_IMAGE}
4546

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
server:
2+
ssl:
3+
enabled: true
4+
protocol: TLS
5+
enabled-protocols: TLSv1.2
6+
key-store-type: PKCS12
7+
ssl.key-store: /config/server_spring.p12
8+
ssl.key-store-password: guest
9+
port: 8080

0 commit comments

Comments
 (0)