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=15e837f46ac83a79d0d78e97995306a10c8ec482;hpb=fa81f28edaf5962fbc034ddcf783c4298573500b;p=osm%2Fdevops.git diff --git a/docker/NG-UI/Dockerfile b/docker/NG-UI/Dockerfile index 15e837f4..53ec2a9d 100644 --- a/docker/NG-UI/Dockerfile +++ b/docker/NG-UI/Dockerfile @@ -13,40 +13,49 @@ # See the License for the specific language governing permissions and # limitations under the License. -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=ReleaseNINE-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/* +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.* \ + 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.* \ + && rm -rf /var/lib/apt/lists/* + +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/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 @@ -55,4 +64,3 @@ HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \ # Starting server. CMD ["nginx", "-g", "daemon off;"] -