Merge "Remove previous releases + fix clamp leftovers"

1 files changed, 13 insertions, 10 deletions

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