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 /dmaap-bc | |
| parent | a2f7b3212b5105eeb5942d75ca25c0a5dbebae52 (diff) | |
Dockerfile improvements
Change-Id: I7a22cdf2957c9a73ded0b5a64367d5404d169b49
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1120
Diffstat (limited to 'dmaap-bc')
| -rw-r--r-- | dmaap-bc/misc/dmaapbc | 6 | ||||
| -rw-r--r-- | dmaap-bc/src/main/resources/Dockerfile | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/dmaap-bc/misc/dmaapbc b/dmaap-bc/misc/dmaapbc index 76317d8..74e8707 100644 --- a/dmaap-bc/misc/dmaapbc +++ b/dmaap-bc/misc/dmaapbc @@ -70,12 +70,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 . misc/havecert.tmpl > etc/havecert chmod +x etc/havecert diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile index f900fed..5664f46 100644 --- a/dmaap-bc/src/main/resources/Dockerfile +++ b/dmaap-bc/src/main/resources/Dockerfile @@ -35,10 +35,12 @@ RUN update-ca-certificates # Install curl RUN apk add --no-cache curl +# Install bash +RUN apk update && apk upgrade && apk add bash + RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \ chmod 600 etc/keystore && \ chmod 600 etc/org.onap.dmaap-bc.trust.jks && \ - chmod +x misc/cert-client-init.sh && \ chmod +x bin/* && \ mkdir logs && \ mkdir www && \ |