X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=10bc3e61e86922cc4224784326cdc9d04a650a2b;hb=HEAD;hp=99c34fdc09b0d3580b7a638b4a68e3fe8e205d52;hpb=42d14ccda0c927f685e4347e2b54c3c111bc3655;p=aai%2Fmodel-loader.git

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 99c34fd..10bc3e6 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,53 +1,18 @@
-###
-# ============LICENSE_START=======================================================
-# MODEL LOADER SERVICE
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
-FROM ubuntu:14.04
-ARG jettyrel=9.3.9.v20160517
-ARG jettydist=jetty-distribution-${jettyrel}
-ARG jettybase=/opt/jetty
+ARG MICRO_HOME=/opt/app/model-loader
 
-RUN apt-get update && apt-get --force-yes -y -f install wget
+WORKDIR $MICRO_HOME
 
-# Install java8
-RUN apt-get install -y software-properties-common
+USER root
 
-# sudo -E is required to preserve the environment
-# If you remove that line, it will most like freeze at this step
+RUN mkdir -p /opt/aaihome $MICRO_HOME /logs && \
+    ln -s /logs $MICRO_HOME/logs && \
+    chown -R aaiadmin:aaiadmin $MICRO_HOME && \
+    chown -R aaiadmin:aaiadmin /logs
 
-RUN apt-get install --reinstall ca-certificates && \
-		sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
+COPY --chown=aaiadmin:aaiadmin /maven/model-loader/ .
 
-# Setup JAVA_HOME, this is useful for docker commandline
+ENTRYPOINT ["/bin/bash", "/opt/app/model-loader/bin/start.sh"]
 
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
-RUN export JAVA_HOME
-
-RUN wget http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jettyrel}/${jettydist}.tar.gz
-RUN gunzip ${jettydist}.tar.gz && tar xvf ${jettydist}.tar
-
-COPY model-loader* $jettydist/webapps/model-loader/
-
-COPY startup.sh update_config.sh ${jettydist}/bin/
-RUN chmod 700 ${jettydist}/bin/startup.sh && chmod 700 ${jettydist}/bin/update_config.sh
-RUN mkdir -p ${jettybase}
-RUN mv ${jettydist} ${jettybase}/${jettydist}
-RUN rm -rf $jettybase/$jettydist/demo-base
-
-CMD /opt/jetty/*/bin/startup.sh
+USER aaiadmin