Use absolute file path in ENV KEYSTORE and TRUSTSTORE in Archive and …

…Keycloak docker image dcm4che/dcm4chee-arc-light#1720
dcm4che-dockerfiles · Dec 4, 2018 · 0500bd9 · 0500bd9
1 parent 13200c9
commit 0500bd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,13 +33,13 @@ ENV LDAP_URL=ldap://ldap:389 \
     HTTP_PORT=8080 \
     HTTPS_PORT=8443 \
     MANAGEMENT_HTTP_PORT=9990 \
-    KEYSTORE=dcm4chee-arc/key.jks \
+    KEYSTORE=/opt/wildfly/standalone/configuration/dcm4chee-arc/key.jks \
     KEYSTORE_PASSWORD=secret \
     KEYSTORE_PASSWORD_FILE=/tmp/keystore_password \
     KEY_PASSWORD=secret \
     KEY_PASSWORD_FILE=/tmp/key_password \
     KEYSTORE_TYPE=JKS \
-    TRUSTSTORE=dcm4chee-arc/cacerts.jks \
+    TRUSTSTORE=/opt/wildfly/standalone/configuration/dcm4chee-arc/cacerts.jks \
     TRUSTSTORE_PASSWORD=secret \
     TRUSTSTORE_PASSWORD_FILE=/tmp/truststore_password \
     SSL_REQUIRED=external \

diff --git a/README.md b/README.md
@@ -110,7 +110,8 @@ bypassing the verification of user permissions. Default value is `admin`.
 
 #### `KEYSTORE`
 
-This environment variable sets the keystore used in ssl server identities in Wildfly configuration. Default value is `dcm4chee-arc/key.jks`.
+This environment variable sets the keystore used in ssl server identities in Wildfly configuration. Default value is
+`/opt/wildfly/standalone/configuration/dcm4chee-arc/key.jks`.
 
 #### `KEYSTORE_PASSWORD`
 
@@ -141,7 +142,7 @@ This environment variable sets the type of keystore that is used above. Default
 #### `TRUSTSTORE`
 
 This environment variable sets the truststore which will be used to verify Keycloak's certificate in Https communication.
-Default value is `dcm4chee-arc/cacerts.jks`.
+Default value is `/opt/wildfly/standalone/configuration/dcm4chee-arc/cacerts.jks`.
 
 #### `TRUSTSTORE_PASSWORD`
 

diff --git a/configuration/dcm4chee-arc.xml b/configuration/dcm4chee-arc.xml
@@ -82,7 +82,7 @@
             <security-realm name="ApplicationRealm">
                 <server-identities>
                     <ssl>
-                        <keystore path="${env.KEYSTORE}" relative-to="jboss.server.config.dir" keystore-password="${env.KEYSTORE_PASSWORD}" key-password="${env.KEY_PASSWORD}" provider="${env.KEYSTORE_TYPE}"/>
+                        <keystore path="${env.KEYSTORE}" keystore-password="${env.KEYSTORE_PASSWORD}" key-password="${env.KEY_PASSWORD}" provider="${env.KEYSTORE_TYPE}"/>
                     </ssl>
                 </server-identities>
                 <authentication>
@@ -672,7 +672,7 @@
                 <public-client>true</public-client>
                 <ssl-required>${env.SSL_REQUIRED}</ssl-required>
                 <resource>${env.UI_CLIENT_ID}</resource>
-                <truststore>${jboss.server.config.dir}/${env.TRUSTSTORE}</truststore>
+                <truststore>${env.TRUSTSTORE}</truststore>
                 <truststore-password>${env.TRUSTSTORE_PASSWORD}</truststore-password>
                 <allow-any-hostname>${env.ALLOW_ANY_HOSTNAME}</allow-any-hostname>
             </secure-deployment>
@@ -682,7 +682,7 @@
                 <public-client>true</public-client>
                 <ssl-required>${env.SSL_REQUIRED}</ssl-required>
                 <resource>${env.RS_CLIENT_ID}</resource>
-                <truststore>${jboss.server.config.dir}/${env.TRUSTSTORE}</truststore>
+                <truststore>${env.TRUSTSTORE}</truststore>
                 <truststore-password>${env.TRUSTSTORE_PASSWORD}</truststore-password>
                 <allow-any-hostname>${env.ALLOW_ANY_HOSTNAME}</allow-any-hostname>
             </secure-deployment>