X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fdocker%2FDockerfile;h=c643b2e55510b977e2cc260805fa9a14d3514eb6;hb=33bec1f4e3b0c824555e23b3681450709822ef76;hp=10c4dd0f41c847a4f99af5623044127cdd3e3324;hpb=bde98deb748fa1f915df6b5ad2a2529e8fcaac88;p=aai%2Fgizmo.git diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 10c4dd0..c643b2e 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -10,14 +10,17 @@ RUN apt-get update && apt-get install -y software-properties-common ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk ## Setup JAVA_HOME, this is useful for docker commandline -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) RUN export JAVA_HOME # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME +RUN mkdir -p $MICRO_HOME/bundleconfig/etc COPY gizmo.jar $MICRO_HOME/ RUN mkdir -p $BIN_HOME COPY *.sh $BIN_HOME +COPY bundleconfig-local $MICRO_HOME/bundleconfig +COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc RUN chmod 755 $BIN_HOME/* RUN ln -s /logs $MICRO_HOME/logs