From c36ccc452171c77c6985d0a511b12e1c9fb1b7dd Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Wed, 17 Oct 2018 10:31:22 -0400 Subject: Updates to build docker images Issue-ID: OPTFRA-373 Change-Id: I3461fb4df7526412525c1ab9ca318316a53e27e9 Signed-off-by: Jerry Flood --- cmso-service/src/main/docker/Dockerfile | 36 ++++++++++-- .../src/main/docker/assembly/cmso-files.xml | 65 ++++++++++++++++++++++ .../src/main/docker/extra-files/startService.sh | 4 ++ cmso-service/src/main/docker/startService.sh | 4 -- cmso-service/src/main/resources/system.properties | 48 ---------------- 5 files changed, 101 insertions(+), 56 deletions(-) create mode 100644 cmso-service/src/main/docker/assembly/cmso-files.xml create mode 100644 cmso-service/src/main/docker/extra-files/startService.sh delete mode 100644 cmso-service/src/main/docker/startService.sh delete mode 100644 cmso-service/src/main/resources/system.properties (limited to 'cmso-service/src/main') diff --git a/cmso-service/src/main/docker/Dockerfile b/cmso-service/src/main/docker/Dockerfile index febb406..97b8cba 100644 --- a/cmso-service/src/main/docker/Dockerfile +++ b/cmso-service/src/main/docker/Dockerfile @@ -1,5 +1,33 @@ -FROM anapsix/alpine-java:8_jdk -ADD cmso-0.1.0-SNAPSHOT.jar app.jar -ADD startService.sh /startService.sh -RUN chmod 700 /startService.sh +FROM ubuntu:16.04 + +MAINTAINER "The Onap Team" +LABEL Description="This image contains ubuntu 16.04 with the openjdk installed" Version="16.04-8" +ENV APP_HOME=/opt/app/cmso +ARG http_proxy +ARG https_proxy +ENV HTTP_PROXY=$http_proxy +ENV HTTPS_PROXY=$https_proxy +ENV http_proxy=$HTTP_PROXY +ENV https_proxy=$HTTPS_PROXY + +RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true && \ + apt-get update && \ + apt-get -y dist-upgrade && \ + apt-get install -y openjdk-8-jre-headless + +COPY onap-cmso/cmso-service.jar ${APP_HOME}/app.jar + +VOLUME /share/etc +VOLUME /share/logs +VOLUME /share/debug-logs + +COPY onap-cmso/startService.sh ${APP_HOME}/startService.sh +COPY onap-cmso/data ${APP_HOME}/data + +RUN chmod 700 ${APP_HOME}/startService.sh +RUN ln -s /share/etc ${APP_HOME}/etc +RUN ln -s /share/logs ${APP_HOME}/logs +RUN ln -s /share/debug-logs ${APP_HOME}/debug-logs + +WORKDIR ${APP_HOME} ENTRYPOINT ./startService.sh diff --git a/cmso-service/src/main/docker/assembly/cmso-files.xml b/cmso-service/src/main/docker/assembly/cmso-files.xml new file mode 100644 index 0000000..2dd3a16 --- /dev/null +++ b/cmso-service/src/main/docker/assembly/cmso-files.xml @@ -0,0 +1,65 @@ + + + + cmso-files + + + tar.gz + + false + + + + + + + ${project.build.finalName}.jar + + ${project.build.directory} + / + + + + etc/keystore/** + + ${project.build.directory} + / + + + + ** + + src/main/docker/extra-files + / + + + + ** + + data + /data + + + + diff --git a/cmso-service/src/main/docker/extra-files/startService.sh b/cmso-service/src/main/docker/extra-files/startService.sh new file mode 100644 index 0000000..dbd111f --- /dev/null +++ b/cmso-service/src/main/docker/extra-files/startService.sh @@ -0,0 +1,4 @@ +#!/bin/sh +echo "VM_ARGS="${VM_ARGS} + +java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar diff --git a/cmso-service/src/main/docker/startService.sh b/cmso-service/src/main/docker/startService.sh deleted file mode 100644 index e7d3121..0000000 --- a/cmso-service/src/main/docker/startService.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -app_args=-Dspring.config.location=${APP_CONFIG_HOME} -echo "app_args ="${app_args} -java -Djava.security.egd=file:/dev/./urandom ${app_args} -Xms1024m -Xmx1024m -jar /app.jar diff --git a/cmso-service/src/main/resources/system.properties b/cmso-service/src/main/resources/system.properties deleted file mode 100644 index 89954f2..0000000 --- a/cmso-service/src/main/resources/system.properties +++ /dev/null @@ -1,48 +0,0 @@ -#------------------------------------------------------------------------------- -# Copyright 2017-2018 AT&T Intellectual Property. -# Modifications Copyright 2018 IBM. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# Unless otherwise specified, all documentation contained herein is licensed -# under the Creative Commons License, Attribution 4.0 Intl. (the ??License?); -# you may not use this documentation except in compliance with the License. -# You may obtain a copy of the License at -# -# https://creativecommons.org/licenses/by/4.0/ -# -# Unless required by applicable law or agreed to in writing, documentation -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#------------------------------------------------------------------------------- - -# If the environment property system_properties_path contains a path to a file, -# System properties created using the file. If the environment variable not present -# system.properties in the class path is used for system property creation - -com.att.eelf.logging.file=logback.xml - -# change as per logback.xml path -com.att.eelf.logging.path= -logging.config= - -spring.config.location=etc/config/ -spring.config.name=application,cmso,optimizer,ticketmgt - -# Default parameters during application startup. -info.build.artifact=@project.artifactId@ -info.build.name=@project.name@ -info.build.version=@project.version@ -- cgit 1.2.3-korg