Cleaning up Dockerfiles

Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: If902c2245e52e8cb911b3cb8fc5e78ded0ed3782

4 files changed, 39 insertions, 90 deletions

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 22f38086..ac2dfb98 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -73,51 +73,27 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>change python permissions</id>
+                        <id>change-permissions</id>
                         <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/ansible-server</argument>
-                                <argument>-name</argument>
-                                <argument>*.py</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
+                            <target>
+                                <chmod perm="+x" type="file">
+                                    <fileset dir="${basedir}/target/docker-stage/ansible-server">
+                                        <include name="**/*.py"/>
+                                        <include name="**/*.sh"/>
+                                    </fileset>
+                                </chmod>
+                            </target>
                         </configuration>
-                    </execution>
-                    <execution>
-                        <id>change shell permissions</id>
-                        <phase>process-sources</phase>
                         <goals>
-                            <goal>exec</goal>
+                            <goal>run</goal>
                         </goals>
-                        <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/ansible-server</argument>
-                                <argument>-name</argument>
-                                <argument>*.sh</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index 27eeb8a3..1aeb186f 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -1,49 +1,30 @@
 FROM onap/integration-python:8.0.0
-
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
-ARG PIP_TAG=18.0
-
-WORKDIR /opt/
+USER root
 
 ENV http_proxy ${http_proxy}
 ENV https_proxy ${https_proxy}
 ENV PIP_EXTRA_OPTS ${https_proxy:+"--trusted-host pypi.org --trusted-host files.pythonhosted.org --proxy=${https_proxy}"}
 ENV PIP_EXTRA_OPTS ${PIP_EXTRA_OPTS:-""}
 
-USER root
-COPY ansible-server/requirements.txt ansible-server/requirements.txt
-
-RUN echo "https_proxy is ${https_proxy} ; PIP_EXTRA_OPTS is ${PIP_EXTRA_OPTS}"
-
-RUN apk add --no-cache curl \
-                       iputils \
-                       bash \
-                       openssh-client &&\
-    curl https://sh.rustup.rs -sSf | sh -s -- -y &&\
-    source $HOME/.cargo/env &&\
-    apk add --no-cache --virtual .build-deps build-base \
-                                             libffi-dev \
-                                             openssl-dev \
-                                             python3-dev &&\
-    pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} && \
-    pip3 install --no-cache-dir -r ansible-server/requirements.txt ${PIP_EXTRA_OPTS} &&\
-    apk del .build-deps
+ARG PIP_TAG=18.0
 
 RUN addgroup -S ansible && adduser -S ansible -G ansible
-
-COPY --chown=ansible:ansible ansible-server ansible-server
+COPY --chown=ansible:ansible ansible-server /opt/ansible-server
 COPY --chown=ansible:ansible configuration/ansible.cfg /etc/ansible/ansible.cfg
 
-WORKDIR /opt/ansible-server
-
-RUN mkdir /opt/onap ; ln -s /opt/ansible-server /opt/onap/ccsdk
-RUN echo > /var/log/ansible-server.log
-RUN chown -R ansible:ansible /var/log
-RUN chown ansible:ansible /opt/ansible-server
+RUN apk add --no-cache curl iputils bash openssh-client \
+    && curl https://sh.rustup.rs -sSf | sh -s -- -y \
+    && source $HOME/.cargo/env \
+    && apk add --no-cache --virtual .build-deps build-base libffi-dev openssl-dev python3-dev \
+    && pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} \
+    && pip3 install --no-cache-dir -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \
+    && apk del .build-deps \
+    && mkdir -p /opt/onap \
+    && touch /var/log/ansible-server.log \
+    && chown -R ansible:ansible /var/log
 
 USER ansible:ansible
-
-
 EXPOSE 8000
-
+WORKDIR /opt/ansible-server
 ##ENTRYPOINT ["python2", "RestServer.py"]
diff --git a/dgbuilder-docker/src/main/docker/Dockerfile b/dgbuilder-docker/src/main/docker/Dockerfile
index a2b9291e..0ca8c04f 100644
--- a/dgbuilder-docker/src/main/docker/Dockerfile
+++ b/dgbuilder-docker/src/main/docker/Dockerfile
@@ -1,23 +1,19 @@
 # Base standard ONAP java base image with added packages needed for nodered
 FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
 MAINTAINER CCSDK  Team (onap-discuss@lists.onap.org)
-
 USER root
 
 RUN addgroup -S dgbuilder && adduser -S dgbuilder -G dgbuilder \
-    && apk --no-cache add curl \
-    && apk add gcc g++ make ncurses \
-    && apk update && apk add yarn nodejs \
+    && apk update && apk --no-cache add curl gcc g++ make ncurses yarn nodejs \
     && node --version
 
 COPY --chown=dgbuilder:dgbuilder opt /opt
 
-WORKDIR /opt/onap/ccsdk/dgbuilder
-
 # Set the proxy if needed
 # RUN npm config set proxy http://your.proxy.com:8080
-RUN cd /opt/onap/ccsdk/dgbuilder/ && npm config set strict-ssl false && npm install
+RUN cd /opt/onap/ccsdk/dgbuilder && npm config set strict-ssl false && npm install
 
-#ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0
 USER dgbuilder
 EXPOSE 3100
+WORKDIR /opt/onap/ccsdk/dgbuilder
+#ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0
diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile
index 710d45d7..da4e25db 100644
--- a/saltstack-server/src/main/docker/Dockerfile
+++ b/saltstack-server/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-#FROM centos:7
 FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
-
+LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 USER root
+
 RUN apk add git tmux vim salt-master salt-minion
 
 #RUN yum clean all && \
@@ -11,16 +11,12 @@ RUN apk add git tmux vim salt-master salt-minion
 #      yum install -y sudo git tmux vim salt-master salt-minion && \
 #      yum clean all
 
-EXPOSE 4505 4506
-
 # Create non root user
-RUN addgroup -S saltstack && adduser -S saltstack -G saltstack
-# RUN groupadd --system saltstack && useradd --system -g saltstack saltstack
-RUN chown -R saltstack /etc/salt /var/log/salt
-RUN mkdir /var/run/salt && chown saltstack:saltstack /var/run/salt
-RUN mkdir /var/cache/salt && chown saltstack:saltstack /var/cache/salt
+RUN addgroup -S saltstack && adduser -S saltstack -G saltstack \
+    && mkdir -p /var/run/salt /var/cache/salt \
+    && chown -R saltstack:saltstack /etc/salt /var/log/salt /var/run/salt /var/cache/salt
 
-USER saltstack
 
-# Run salt-master in foreground (not as a daemon)
-ENTRYPOINT [ "/usr/bin/salt-master" ]
\ No newline at end of file
+USER saltstack
+EXPOSE 4505 4506
+ENTRYPOINT [ "/usr/bin/salt-master" ]