Bug 1858: Adding APT proxy

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

diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile
index 163441f..8350034 100644 (file)
--- a/docker/NG-UI/Dockerfile
+++ b/docker/NG-UI/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2020 ETSI
+#######################################################################################
+# Copyright ETSI Contributors and Others.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +13,15 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#######################################################################################
 
-FROM ubuntu:18.04
+FROM ubuntu:18.04 AS BUILD
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -40,13 +48,22 @@ RUN npm install
 
 # Building app.
 RUN npm run build
-RUN cp /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
+
+FROM ubuntu:18.04 AS FINAL
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    nginx=1.14.* && \
+    rm -rf /var/lib/apt/lists/*
 
 # Removing the Nginx default page.
 RUN rm -rf /usr/share/nginx/html/*
 
+# Copying Nginx configuration
+COPY --from=BUILD /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
+
 # Copying angular build to Nginx default page.
-RUN cp -r /usr/share/osm-ngui/dist/osm/* /usr/share/nginx/html
+COPY --from=BUILD /usr/share/osm-ngui/dist/osm /usr/share/nginx/html
 
 EXPOSE 80