Merge v8.0 Into Master

[osm/devops.git] / docker / NG-UI / Dockerfile

diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index b781ec0..314beff 100644 (file)
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \
     && apt-get install -y nginx
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseSEVEN-daily
+ARG RELEASE=ReleaseEIGHT-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 ARG NGUI_VERSION
@@ -37,10 +37,16 @@ RUN apt-get install -y osm-ngui${NGUI_VERSION} && \
 
 WORKDIR /usr/share/osm-ngui
 RUN npm install
+
 # Building app.
 RUN npm run build
-RUN cp /usr/share/osm-ngui/nginx.conf /etc/nginx/sites-available/default
-#RUN cp /usr/share/osm-ngui/supervisor-app.conf /etc/supervisor/conf.d/
+RUN cp /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
+
+# Removing the Nginx default page.
+RUN rm -rf /usr/share/nginx/html/*
+
+# Copying angular build to Nginx default page.
+RUN cp -r /usr/share/osm-ngui/dist/osm/* /usr/share/nginx/html
 
 EXPOSE 80