diff options
Diffstat (limited to 'src/main/docker')
| -rw-r--r-- | src/main/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | src/main/docker/cadi.properties | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 1896aab..e3becb8 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -10,10 +10,12 @@ ENV COMPONENT=kafka \ KAFKA_USER=mrkafka RUN echo "===> installing ${COMPONENT}..." \ - && apt-get update && apt-get install -y confluent-kafka-${SCALA_VERSION}=${CONFLUENT_VERSION}${CONFLUENT_PLATFORM_LABEL}-${CONFLUENT_DEB_VERSION} \ + && wget -qO - http://packages.confluent.io/deb/3.0/archive.key | apt-key add - \ + && echo "deb [arch=amd64] http://packages.confluent.io/deb/3.0 stable main" | tee -a /etc/apt/sources.list \ + && apt-key update && apt-get update && apt-get install -y confluent-kafka-2.11 --force-yes \ \ && echo "===> clean up ..." \ - && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \ + && apt-get autoremove -y && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* \ \ && echo "===> Setting up ${COMPONENT} dirs..." \ && mkdir -p /var/lib/${COMPONENT}/data /etc/${COMPONENT}/secrets/cert /etc/${COMPONENT}/secrets/jaas /etc/${COMPONENT}/data /var/log/kafka /var/log/confluent \ diff --git a/src/main/docker/cadi.properties b/src/main/docker/cadi.properties index 55d11c4..15dcb4d 100644 --- a/src/main/docker/cadi.properties +++ b/src/main/docker/cadi.properties @@ -4,13 +4,13 @@ aaf_env=DEV aaf_lur=org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm cadi_truststore=/etc/kafka/secrets/cert/org.onap.dmaap.mr.trust.jks -cadi_truststore_password=enc:gvXm0E9p-_SRNw5_feOUE7wqXBxgxV3S_bdAyB08Sq9F35cCUZHWgQyKIDtTAbEw +cadi_truststore_password=enc:7U4uOSdXQblnjiDsrqyjXugG4nChBXBBjqZ5amRaCq5yeYzbC9hQpH7BwUzYTa59 cadi_keyfile=/etc/kafka/secrets/cert/org.onap.dmaap.mr.keyfile cadi_alias=dmaapmr@mr.dmaap.onap.org cadi_keystore=/etc/kafka/secrets/cert/org.onap.dmaap.mr.p12 -cadi_keystore_password=enc:pLMCzQzk-OP7IpYNi0TPtQSkNcraFAdarZG8HbdOKq4BycW6g_7mfhphLhOZo6ht +cadi_keystore_password=enc:NHmvDrri9DSkZJ_-GLuOM0e-UGi_RpVgj9xYdpAamEILHm7I2E6rjbOif2G94UYW cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US |