Skip to content

Commit

Permalink
Use absolute file path in ENV KEYSTORE and TRUSTSTORE in Archive and …
Browse files Browse the repository at this point in the history
…Keycloak docker image dcm4che/dcm4chee-arc-light#1720
  • Loading branch information
gunterze committed Dec 4, 2018
1 parent 117bee8 commit 984db0a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
WILDFLY_EXECUTER_MAX_THREADS=100 \
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion configuration/dcm4chee-arc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,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>
Expand Down

0 comments on commit 984db0a

Please sign in to comment.