diff options
| author |   dglFromAtt <dgl@research.att.com> | 2019-03-25 19:01:12 +0000 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2019-03-25 19:09:26 +0000 |
| commit | bd10cc4a582b3d1a2f162aab5a2494953618af93 (patch) | |
| tree | 2b64dbdff60e9a9e56e2bae61a9c986130995e3f /dbc-client | |
| parent | a2f7b3212b5105eeb5942d75ca25c0a5dbebae52 (diff) | |
Dockerfile improvements
Change-Id: I7a22cdf2957c9a73ded0b5a64367d5404d169b49
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1120
Diffstat (limited to 'dbc-client')
| -rw-r--r-- | dbc-client/misc/dbc-client | 11 | ||||
| -rw-r--r-- | dbc-client/src/main/resources/Dockerfile | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client index cf6c230..a7317fa 100644 --- a/dbc-client/misc/dbc-client +++ b/dbc-client/misc/dbc-client @@ -33,8 +33,8 @@ CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config} CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/dbc-client.env REQUESTID=${REQUESTID:-dbc-client} DBC=${DBC:-dmaap-bc} -PROTO=${PROTO:-http} -PORT=${PORT:-8080} +PROTO=${PROTO:-https} +PORT=${PORT:-8443} @@ -65,13 +65,6 @@ config() { echo "Not creating $APP_ROOT/ok_to_exit" fi - if [ ! -f $APP_ROOT/misc/cert-client-init.sh ] - then - echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore" - exit 1 - fi - $APP_ROOT/misc/cert-client-init.sh - set +x } diff --git a/dbc-client/src/main/resources/Dockerfile b/dbc-client/src/main/resources/Dockerfile index 2025a5e..90cd7f9 100644 --- a/dbc-client/src/main/resources/Dockerfile +++ b/dbc-client/src/main/resources/Dockerfile @@ -37,8 +37,7 @@ RUN apk add --no-cache curl RUN apk add --no-cache curl -RUN chmod +x /opt/app/dbc-client/misc/cert-client-init.sh && \ - chmod +x /opt/app/dbc-client/bin/* && \ +RUN chmod +x /opt/app/dbc-client/bin/* && \ mkdir /opt/app/dbc-client/logs VOLUME /opt/app/dbc-client/log |