From d5339481d3c3f24dd5faccb44dccd4addfd58499 Mon Sep 17 00:00:00 2001 From: Oleg Mitsura Date: Mon, 22 Apr 2019 17:47:33 -0400 Subject: SDC Listner Docker touchup 1.Reworked Dockerization of SDC Listener to follow application/distribution+parent style; 2.Renamed CDS-SDClistener to just SDCListener Issue-ID: CCSDK-1145 Change-Id: I007373d3a48fb8eb7042150bdbb37fc7fec346b3 Signed-off-by: Oleg Mitsura --- .../application/src/main/docker/Dockerfile | 13 ---------- .../src/main/docker/docker-compose.yaml | 29 ---------------------- .../application/src/main/docker/start.sh | 6 ----- 3 files changed, 48 deletions(-) delete mode 100644 ms/cds-sdc-listener/application/src/main/docker/Dockerfile delete mode 100644 ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml delete mode 100755 ms/cds-sdc-listener/application/src/main/docker/start.sh (limited to 'ms/cds-sdc-listener/application/src/main/docker') diff --git a/ms/cds-sdc-listener/application/src/main/docker/Dockerfile b/ms/cds-sdc-listener/application/src/main/docker/Dockerfile deleted file mode 100644 index 062f65767..000000000 --- a/ms/cds-sdc-listener/application/src/main/docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM openjdk:8-jdk-alpine - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN mkdir -p /opt/app/onap/ /opt/app/onap/config -WORKDIR /opt/app/onap/ -COPY start.sh /opt/app/onap/ -COPY application.yml /opt/app/onap/config -RUN chmod 751 /opt/app/onap/start.sh -COPY cds-sdc-listener-application-0.4.2-SNAPSHOT.jar /opt/app/onap/cds-sdc-listener-distribution.jar -EXPOSE 9000 -ENTRYPOINT /opt/app/onap/start.sh diff --git a/ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml b/ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml deleted file mode 100644 index 1e7384744..000000000 --- a/ms/cds-sdc-listener/application/src/main/docker/docker-compose.yaml +++ /dev/null @@ -1,29 +0,0 @@ -version: '3.3' - -services: - cds-sdc-listener: - image: onap/cdssdclistener:latest - container_name: cdssdclistener - restart: always - environment: - asdcAddress: localhost:8443 - messageBusAddress: localhost - sdcusername: vid - password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - pollingInterval: 15 - pollingTimeout: 15 - relevantArtifactTypes: TOSCA_CSAR - consumerGroup: cds-id-local - environmentName: AUTO - consumerId: cds-id-local - keyStorePassword: - keyStorePath: - activateServerTLSAuth: "false" - isUseHttpsWithDmaap: "false" - archivePath: /opt/app/onap/cds-sdc-listener/ - grpcAddress: localhost - grpcPort: 9111 - authHeader: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== - #port needed by Liveness probe - healthcheckPort: "9000" - sprintWebListenerEnabled: "true" diff --git a/ms/cds-sdc-listener/application/src/main/docker/start.sh b/ms/cds-sdc-listener/application/src/main/docker/start.sh deleted file mode 100755 index f24d15618..000000000 --- a/ms/cds-sdc-listener/application/src/main/docker/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -extraArgs=$@ -java -jar /opt/app/onap/cds-sdc-listener-distribution.jar \ --Dspring.config=/opt/app/onap/config/application.yml \ --Djava.security.egd=file:/dev/./urandom \ -${extraArgs} -- cgit 1.2.3-korg