From aafdcc2c4373806401de81ae4cc32fa4c66cabd2 Mon Sep 17 00:00:00 2001 From: sheetalm Date: Wed, 18 Apr 2018 11:21:26 +0530 Subject: ActivitySpec-Change the base images in dockerfile Change the base images in dockerfile Use cqlsh on alpine base image instead of onap/cqlsh. Remove default 9042 port since this image works on 9160 Default port to 9160 Add version to jetty base image Change-Id: I88a631174801769452551d3607fe744a831068a4 Issue-ID: SDC-1048 Signed-off-by: sheetalm --- services/activity-spec/activity-spec-init/Dockerfile | 8 +++++--- services/activity-spec/activity-spec-init/start.sh | 2 +- services/activity-spec/activity-spec-web/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/services/activity-spec/activity-spec-init/Dockerfile b/services/activity-spec/activity-spec-init/Dockerfile index 25fcd38411..09361461dd 100644 --- a/services/activity-spec/activity-spec-init/Dockerfile +++ b/services/activity-spec/activity-spec-init/Dockerfile @@ -1,10 +1,12 @@ -FROM cassandra:2.1.9 +FROM alpine:3.7 -ENV CASSANDRA_PORT=9042 +RUN apk add --no-cache 'python<3' py-pip && pip install cqlsh==4.0.1 + +ENV CASSANDRA_PORT=9160 COPY create_activityspec_db.cql . COPY start.sh . RUN chmod 744 start.sh -ENTRYPOINT ["/start.sh"] \ No newline at end of file +ENTRYPOINT ["./start.sh"] \ No newline at end of file diff --git a/services/activity-spec/activity-spec-init/start.sh b/services/activity-spec/activity-spec-init/start.sh index 5242bd5d9e..defc8efedf 100644 --- a/services/activity-spec/activity-spec-init/start.sh +++ b/services/activity-spec/activity-spec-init/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [[ -z "${CASSANDRA_HOST}" ]]; then echo "CASSANDRA_HOST environment variable must be set" diff --git a/services/activity-spec/activity-spec-web/Dockerfile b/services/activity-spec/activity-spec-web/Dockerfile index 3ef0ef3eb1..fe7e20bd3c 100644 --- a/services/activity-spec/activity-spec-web/Dockerfile +++ b/services/activity-spec/activity-spec-web/Dockerfile @@ -1,4 +1,4 @@ -FROM jetty:alpine +FROM jetty:9.4.9-alpine EXPOSE 8080 EXPOSE 8443 -- cgit 1.2.3-korg