X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNG-UI%2FDockerfile;h=53ec2a9dbecc689af8725bfc4e9c84ef468202c0;hb=9af7d42ffc9febc17a1f232b11e260832d0ec9e3;hp=b7ca8f7b12eb320e0493a75e1a64a292e113b332;hpb=fd164afb3c0f828561b41c6c42a1e351c5d9b653;p=osm%2Fdevops.git diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index b7ca8f7b..53ec2a9d 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ubuntu:18.04 +FROM ubuntu:18.04 AS BUILD RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ 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.* + apt-get install -y nodejs=10.24.* \ + && rm -rf /var/lib/apt/lists/* ARG OSM_NGUI_URL @@ -39,13 +40,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