Fix dockerfile to reflect common image naming

FROM section changed to reflerct new
aai-common image naming scheme.

Added explicit aai-common version parameter.

Change-Id: Ifc1187384ce757f1a2bf852a670dd9d706a4c782
Issue-ID: INT-1141
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>

3 files changed, 69 insertions, 48 deletions

diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..2a1a2e7
--- /dev/null
+++ b/src/main/assembly/descriptor.xml
@@ -0,0 +1,36 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"

+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

+    <id>build</id>

+    <includeBaseDirectory>false</includeBaseDirectory>

+    <formats>

+        <format>dir</format>

+    </formats>

+    <fileSets>

+        <fileSet>

+            <directory>${project.basedir}/bundleconfig-local</directory>

+            <outputDirectory>/bundleconfig</outputDirectory>

+            <includes>

+                <include>**/*</include>

+            </includes>

+        </fileSet>

+        <fileSet>

+            <directory>${project.basedir}/src/main/bin</directory>

+            <outputDirectory>/bin</outputDirectory>

+            <includes>

+                <include>**/*</include>

+            </includes>

+        </fileSet>

+        <fileSet>

+            <directory>${project.build.directory}</directory>

+            <outputDirectory>/</outputDirectory>

+            <includes>

+                <include>*.jar</include>

+            </includes>

+            <excludes>

+                <exclude>Dockerfile</exclude>

+                <exclude>*.sh</exclude>

+            </excludes>

+        </fileSet>

+    </fileSets>

+</assembly>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 343ed4d..35297e7 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,45 +1,25 @@
-FROM ubuntu:14.04
+FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@
 
 ARG MICRO_HOME=/opt/app/crud-api
 ARG BIN_HOME=$MICRO_HOME/bin
+ARG USERS_HOME=/opt/aaihome
 
-RUN apt-get update
-
-# Install and setup java8
-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
-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/*
-
-# Changes related to:AAI-2177
-# Change aai gizmo container processes to run as non-root on the host
+# AAI-2177: Change aai gizmo container processes to run as non-root on the host
 
 #Note:The group id and user id used below (492382 & 341790 respectively) are chosen arbitarily based on assumption that
 # these are not used elsewhere. Please see  https://jira.onap.org/browse/AAI-2172 for more background on this.
 
-RUN mkdir /opt/aaihome && \
-     groupadd -g 492382 aaiadmin && \
-     useradd -r -u 341790  -g 492382 -ms /bin/sh -d /opt/aaihome/aaiadmin aaiadmin && \
-     chown -R aaiadmin:aaiadmin $MICRO_HOME &&\
-     mkdir /logs && \
-     chown -R aaiadmin:aaiadmin  /logs
+RUN mkdir -p $MICRO_HOME $USERS_HOME /logs \
+    && groupadd -g 492382 aaiadmin \
+    && useradd -r -u 341790  -g 492382 -ms /bin/sh -d $USERS_HOME/aaiadmin aaiadmin
+WORKDIR $MICRO_HOME
+COPY /maven/gizmo/ .
+RUN chmod 755 $BIN_HOME/* \
+    && ln -snf /logs $MICRO_HOME/logs \
+    && chown -R aaiadmin:aaiadmin $MICRO_HOME /logs
 
 USER aaiadmin
 
-RUN ln -s /logs $MICRO_HOME/logs
-
 EXPOSE 9520 9520
 
 CMD ["/opt/app/crud-api/bin/start.sh"]
diff --git a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
index b28ba3a..5cb8dc6 100644
--- a/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
+++ b/src/test/java/org/onap/crud/event/response/GraphEventResponseHandlerTest.java
@@ -20,11 +20,15 @@
  */
 package org.onap.crud.event.response;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.BeforeClass;
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.crud.OXMModelLoaderSetup;
 import org.onap.crud.event.GraphEvent;
 import org.onap.crud.event.GraphEvent.GraphEventOperation;
 import org.onap.crud.event.envelope.GraphEventEnvelope;
@@ -32,29 +36,30 @@ import org.onap.crud.exception.CrudException;
 import org.onap.crud.util.TestUtil;
 import org.onap.schema.EdgeRulesLoader;
 import org.onap.schema.OxmModelLoader;
-import com.google.gson.Gson;
-import com.google.gson.JsonParser;
 
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.crud.OXMModelLoaderSetup;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class GraphEventResponseHandlerTest extends OXMModelLoaderSetup {
+    private static boolean setUpIsNotDone = true;
+    
+    @Before
+    public void setUpOnce() throws CrudException {
+        if (setUpIsNotDone) {
+            System.setProperty("CONFIG_HOME", "src/test/resources");
+            System.setProperty("AJSC_HOME", ".");
+            System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+
+            OxmModelLoader.loadModels();
+            EdgeRulesLoader.loadModels();
+
+            setUpIsNotDone = false;
+        }
+    }
 
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        System.setProperty("CONFIG_HOME", "src/test/resources");
-        System.setProperty("AJSC_HOME", ".");
-        System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
-
-        OxmModelLoader.loadModels();
-        EdgeRulesLoader.loadModels();
-    }
-
     @Test
     public void testPolicyViolationsNotDetected() throws Exception {
         String expectedEnvelope = TestUtil.getFileAsString("event/event-envelope-sentinel-no-violations.json");