dcm4che/dcm4chee-arc-light#2733 : Change format of sample key and tru…

…ststore from JKS to PKCS12
dcm4che-dockerfiles · Aug 25, 2020 · ec6b291 · ec6b291
1 parent 45fcb31
commit ec6b291
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -57,7 +57,8 @@ ENV LDAP_URL=ldap://ldap:389 \
     LDAP_BASE_DN=dc=dcm4che,dc=org \
     KEYSTORE=/opt/keycloak/standalone/configuration/keystores/key.p12 \
     KEYSTORE_TYPE=PKCS12 \
-    TRUSTSTORE=/opt/keycloak/standalone/configuration/keystores/cacerts.jks \
+    TRUSTSTORE=/opt/keycloak/standalone/configuration/keystores/cacerts.p12 \
+    TRUSTSTORE_TYPE=PKCS12 \
     KEYCLOAK_IMPORT=/opt/keycloak/standalone/configuration/dcm4che-realm.json
 
 # Ensure signals are forwarded to the JVM process correctly for graceful shutdown

diff --git a/README.md b/README.md
@@ -183,6 +183,10 @@ Password used to protect the integrity of the keystore specified by `TRUSTSTORE`
 Password used to protect the integrity of the keystore specified by `TRUSTSTORE` via file input
 (alternative to `TRUSTSTORE_PASSWORD`).
 
+#### `TRUSTSTORE_TYPE`
+
+Type (`JKS` or `PKCS12`) of the keystore specified by `TRUSTSTORE` (optional, default is `PKCS12`).
+
 #### `TLS_PROTOCOLS`
 
 Comma separated list of enabled TLS protocols (`SSLv2`, `SSLv3`, `TLSv1`, `TLSv1.1`, `TLSv1.2`, `TLSv1.3`)

diff --git a/configuration/keystores/cacerts.jks b/configuration/keystores/cacerts.jks
diff --git a/configuration/keystores/cacerts.p12 b/configuration/keystores/cacerts.p12
diff --git a/configuration/keystores/key.jks b/configuration/keystores/key.jks