Dockerfile improvements

Change-Id: I7a22cdf2957c9a73ded0b5a64367d5404d169b49
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1120

diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index cf6c230..a7317fa 100644 (file)
--- 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 (file)
--- 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

diff --git a/dmaap-bc/misc/dmaapbc b/dmaap-bc/misc/dmaapbc
index 76317d8..74e8707 100644 (file)
--- 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 (file)
--- 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 && \

diff --git a/misc/cert-client-init.sh b/misc/cert-client-init.sh
deleted file mode 100644 (file)
index e9a50d7..0000000
--- a/misc/cert-client-init.sh
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
-BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
-NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
-DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
-XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
-H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
-pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
-NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
-2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
-wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
-ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
-P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
-aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
-PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
-A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
-UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
-BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
-L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
-7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
-c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
-jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
-RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
-PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
-CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
-Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
-cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
-ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
-dYY=
------END CERTIFICATE-----