X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fcadi.git;a=blobdiff_plain;f=sidecar%2Ffproxy%2Fsrc%2Fmain%2Fdocker%2FDockerfile;fp=sidecar%2Ffproxy%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=4537e2447fa7f019d2f874509d4213cffe5187e0;hp=d91f0e386b1ac173ff0ca461aaa181381451f1cb;hb=25c0056a7846168dbc5cc86615039ad8d1e9a35d;hpb=c932b38f09dd98b8f93d6b0dfac0d556e0126138

diff --git a/sidecar/fproxy/src/main/docker/Dockerfile b/sidecar/fproxy/src/main/docker/Dockerfile
index d91f0e3..4537e24 100644
--- a/sidecar/fproxy/src/main/docker/Dockerfile
+++ b/sidecar/fproxy/src/main/docker/Dockerfile
@@ -1,35 +1,28 @@
-FROM ubuntu:14.04
+FROM openjdk:8-alpine
 
 ARG MICRO_HOME=/opt/app/fproxy
 ARG BIN_HOME=$MICRO_HOME/bin
 ARG JAR_FILE=fproxy-exec.jar
 
-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
-
-RUN sudo dpkg --purge --force-depends ca-certificates-java
-RUN sudo apt-get install ca-certificates-java
+RUN apk update && \
+    apk add ca-certificates
 
 ## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV JAVA_HOME usr/lib/jvm/java-1.8-openjdk
 RUN export JAVA_HOME
 
 # Build up the deployment folder structure
 RUN mkdir -p $MICRO_HOME
-COPY ${JAR_FILE} $MICRO_HOME
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-RUN chmod 755 $BIN_HOME/*
-RUN ln -s /logs $MICRO_HOME/logs
-RUN mkdir /logs
+WORKDIR $MICRO_HOME
+COPY maven/fproxy/ .
+RUN chmod 755 $BIN_HOME/* && \
+    mkdir /logs && \
+    ln -s /logs $MICRO_HOME/logs
 # Create the appuser
-RUN groupadd -r appgroup && \
-    useradd -r -u 1001 -g appgroup appuser && \
+RUN addgroup --system appgroup && \
+    adduser --system --uid 1001 --ingroup appgroup appuser && \
     chown -R appuser:appgroup $MICRO_HOME && \
     chmod 777 /logs
 USER appuser
+
 CMD ["/opt/app/fproxy/bin/start.sh"]