Merge "Move to alpine"

3 files changed, 4 insertions, 46 deletions

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 983dea7da..f2c7edd8e 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:16.04

+FROM openjdk:8u191-jdk-alpine3.9

 

 MAINTAINER "The Onap Team"

-LABEL Description="This immage contains an updated ubuntu 16.04 with the openjdk installed" Version="16.04-8"

+LABEL Description="This immage contains alpine, openjdk 11 and clamp"

 

 ARG http_proxy

 ARG https_proxy

@@ -10,12 +10,7 @@ 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

-

-RUN groupadd -r onap && useradd --no-log-init -r -g onap clamp

+RUN addgroup onap && adduser -D -G onap clamp

 VOLUME /opt/clamp/config

 RUN mkdir /var/log/onap

 RUN chmod a+rwx /var/log/onap

@@ -23,11 +18,8 @@ RUN chmod a+rwx /var/log/onap
 COPY onap-clamp/clamp.jar /opt/clamp/app.jar

 RUN chmod 700 /opt/clamp/app.jar

 

-COPY onap-clamp/startService.sh /opt/clamp/startService.sh

-RUN chmod 700 /opt/clamp/startService.sh

-

 RUN chown -R clamp:onap /opt/clamp

 

 USER clamp

 WORKDIR /opt/clamp/

-ENTRYPOINT ./startService.sh 

+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms256m", "-Xmx1g", "-jar" ,"./app.jar"]

diff --git a/src/main/docker/assembly/clamp-files.xml b/src/main/docker/assembly/clamp-files.xml
index c65a6c50f..e4e9875c5 100644
--- a/src/main/docker/assembly/clamp-files.xml
+++ b/src/main/docker/assembly/clamp-files.xml
@@ -53,13 +53,6 @@
 			<directory>${project.build.directory}</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<includes>
-				<include>**</include>
-			</includes>
-			<directory>src/main/docker/extra-files</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
 	</fileSets>
 
 </assembly>
diff --git a/src/main/docker/extra-files/startService.sh b/src/main/docker/extra-files/startService.sh
deleted file mode 100644
index 3b73354d7..000000000
--- a/src/main/docker/extra-files/startService.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# 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.
-# ============LICENSE_END============================================
-# ===================================================================
-# 
-###
-
-java -Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1g -jar ./app.jar
-