From bfabac95923a74a2e53e1deeb840205bbf92cd0a Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Wed, 6 Jan 2021 17:24:18 +0100
Subject: Remove previous releases + fix clamp leftovers

Remove clamp releases from that new policy project and fix also additional clamp leftovers

Issue-ID: POLICY-2922
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I25cc246c4ec6b44dd105b03800c915c9c05c5f0b
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 src/main/docker/backend/Dockerfile  | 16 +++++++++-------
 src/main/docker/frontend/Dockerfile | 23 +++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'src/main/docker')

diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile
index 8712f1934..63268d805 100644
--- a/src/main/docker/backend/Dockerfile
+++ b/src/main/docker/backend/Dockerfile
@@ -24,7 +24,7 @@
 FROM onap/integration-java11:7.1.0
 
 MAINTAINER "The Onap Team"
-LABEL Description="This image contains alpine, openjdk 11 and clamp"
+LABEL Description="This image contains alpine, openjdk 11 and policy clamp"
 
 ARG http_proxy
 ARG https_proxy
@@ -32,14 +32,16 @@ ENV HTTP_PROXY=$http_proxy
 ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY
 ENV https_proxy=$HTTPS_PROXY
+
 USER root
-RUN mkdir /opt/clamp
-RUN chown -R onap:onap /opt/clamp
 
-VOLUME /opt/clamp/config
+RUN mkdir -p /opt/policy/clamp && \
+    chown -R onap:onap /opt/policy/clamp
+
+VOLUME /opt/policy/clamp/config
 
-COPY --chown=onap:onap onap-clamp-backend/clamp.jar /opt/clamp/app.jar
+COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar
 
 USER onap
-WORKDIR /opt/clamp/
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=75","-jar" ,"./app.jar"]
\ No newline at end of file
+WORKDIR /opt/policy/clamp/
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]
\ No newline at end of file
diff --git a/src/main/docker/frontend/Dockerfile b/src/main/docker/frontend/Dockerfile
index 660fb8240..e67495350 100644
--- a/src/main/docker/frontend/Dockerfile
+++ b/src/main/docker/frontend/Dockerfile
@@ -25,9 +25,9 @@
 FROM node:12.10.0-alpine as build
 WORKDIR /app
 #ENV PATH /app/node_modules/.bin:$PATH
-COPY onap-clamp-frontend/ /app/
-RUN npm install --silent
-RUN npm run build
+COPY onap-policy-clamp-frontend/ /app/
+RUN npm install --silent && \
+    npm run build
 
 FROM nginx:1.17.0-alpine
 
@@ -41,14 +41,17 @@ ENV HTTPS_PROXY=$https_proxy
 ENV http_proxy=$HTTP_PROXY
 ENV https_proxy=$HTTPS_PROXY
 
-RUN addgroup onap && adduser -D -G onap clamp
-RUN mkdir /var/log/onap
-RUN chmod a+rwx /var/log/onap
+RUN addgroup onap && \
+    adduser -D -G onap clamp && \
+    mkdir /var/log/onap && \
+    chmod a+rwx /var/log/onap
 
 COPY --from=build /app/build /usr/share/nginx/html
 COPY --from=build /app/ssl /etc/ssl
-RUN rm /etc/nginx/conf.d/default.conf
-RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
+
+RUN rm /etc/nginx/conf.d/default.conf && \
+    ln -sf /dev/stdout /var/log/nginx/access.log && \
+    ln -sf /dev/stderr /var/log/nginx/error.log
 
 COPY nginx/nginx.conf /etc/nginx/nginx.conf
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
@@ -58,8 +61,8 @@ WORKDIR /app
 RUN chown -R clamp:onap /app && chmod -R 755 /app && \
         chown -R clamp:onap /var/cache/nginx && \
         chown -R clamp:onap /var/log/nginx && \
-        chown -R clamp:onap /etc/nginx/conf.d
-RUN touch /var/run/nginx.pid && \
+        chown -R clamp:onap /etc/nginx/conf.d && \
+        touch /var/run/nginx.pid && \
         chown -R clamp:onap /var/run/nginx.pid
 
 USER clamp
-- 
cgit 1.2.3-korg