X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNG-UI%2FDockerfile;h=934566d61e62fd0da876ce44c38300f5cd1562a4;hb=41165ed261e63bb6c87c3064bfc9d3d700d8cd0a;hp=b781ec05392a29001ac9c482f4003af5fb7eba3f;hpb=9887bb483aca5c1948ecb1939223036316574ed9;p=osm%2Fdevops.git

diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index b781ec05..934566d6 100644
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -15,32 +15,37 @@
 
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \
-    && apt-get update && apt-get install -y apt-transport-https software-properties-common \
-    && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-    && echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list \
-    && echo "deb-src https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update && apt-get install -y nodejs \
-    && apt-get install -y nginx
-
-ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseSEVEN-daily
-ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
-ARG REPOSITORY=testing
-ARG NGUI_VERSION
-
-RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} NG-UI" && apt-get update
-
-RUN apt-get install -y osm-ngui${NGUI_VERSION} && \
-    rm -rf /var/lib/apt/lists/*
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    apt-transport-https=1.6.12ubuntu0.2 \
+    curl=7.58.0-2ubuntu3.13 \
+    gnupg2=2.2.4-1ubuntu1.4 \
+    nginx=1.14.0-0ubuntu1.9 \
+    software-properties-common=0.96.24.32.14 \
+    xz-utils=5.2.2-1.3
+
+RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+    echo "deb https://deb.nodesource.com/node_10.x xenial main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
+    apt-get update && \
+    apt-get install -y nodejs=10.24.1-1nodesource1
+
+ARG OSM_NGUI_URL
+
+RUN curl $OSM_NGUI_URL -o osm_ngui.deb
+RUN dpkg -i ./osm_ngui.deb
 
 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
 
@@ -49,4 +54,3 @@ HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
 
 # Starting server.
 CMD ["nginx", "-g", "daemon off;"]
-