-# 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.
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#######################################################################################
-FROM ubuntu:18.04
+FROM ubuntu:20.04 as INSTALL
+
+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 \
- apt-transport-https=1.6.* \
- curl=7.58.* \
+ apt-transport-https=2.0.* \
+ curl=7.68.* \
gnupg2=2.2.* \
- nginx=1.14.* \
- software-properties-common=0.96.* \
+ nginx=1.18.* \
+ software-properties-common=0.99.* \
xz-utils=5.2.*
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.*
+ echo "deb https://deb.nodesource.com/node_10.x focal main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
+ DEBIAN_FRONTEND=noninteractive apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs=10.24.*
ARG OSM_NGUI_URL
# Building app.
RUN npm run build
-RUN cp /usr/share/osm-ngui/nginx/nginx.conf /etc/nginx/sites-available/default
+
+#######################################################################################
+FROM ubuntu:20.04 AS FINAL
+
+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 \
+ nginx=1.18.* && \
+ rm -rf /var/lib/apt/lists/*
# Removing the Nginx default page.
RUN rm -rf /usr/share/nginx/html/*
+# Copying Nginx configuration
+COPY --from=INSTALL /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=INSTALL /usr/share/osm-ngui/dist/osm /usr/share/nginx/html
EXPOSE 80