X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FNG-UI%2FDockerfile;h=53ec2a9dbecc689af8725bfc4e9c84ef468202c0;hb=refs%2Ftags%2Fv11.0.0rc1;hp=9ea5d3d09eb535ce2a37e3ce1f810fab52a1ad3e;hpb=b89f26b8b330e5af11dc47c06c4e65cbbcd0a52b;p=osm%2Fdevops.git diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 9ea5d3d0..53ec2a9d 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -13,21 +13,22 @@ # 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 \ - apt-transport-https=1.6.12ubuntu0.2 \ - curl=7.58.0-2ubuntu3.14 \ - 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 + apt-transport-https=1.6.* \ + curl=7.58.* \ + gnupg2=2.2.* \ + nginx=1.14.* \ + software-properties-common=0.96.* \ + 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.1-1nodesource1 + 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