Skip to content

Commit 7b0a858

Browse files
Configure spring with tls
1 parent 09ec988 commit 7b0a858

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

selenium/bin/components/spring

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ start_spring() {
3333
${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
36+
cp ${SPRING_CONFIG_DIR}/*.jks $MOUNT_SPRING_CONF_DIR
3637

3738
docker run \
3839
--detach \
@@ -41,7 +42,6 @@ start_spring() {
4142
--publish 8080:8080 \
4243
--publish 8443:8443 \
4344
-v ${MOUNT_SPRING_CONF_DIR}:/config \
44-
-v ${MOUNT_SPRING_CONF_DIR}:/opt/spring/data/import/ \
4545
${SPRING_DOCKER_IMAGE}
4646

4747
wait_for_oidc_endpoint spring $SPRING_URL $MOUNT_SPRING_CONF_DIR/ca_spring_certificate.pem

selenium/test/oauth/spring/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ server:
44
protocol: TLS
55
enabled-protocols: TLSv1.2
66
key-store-type: PKCS12
7-
ssl.key-store: /config/server_spring.p12
8-
ssl.key-store-password: guest
7+
key-store: /config/server_spring.jks
8+
key-store-password: foobar
99
port: 8080

0 commit comments

Comments
 (0)