Remove repositories as Docker files dependency

Docker files used to clone git repositories for internal
configuration managements. The git repositories should now be
clone outside of the image building process and put in a specific
directory.
See src/main/docker/docker-files/chef-configs/readme.md.

Change-Id: I4f8700b5f6e89821d223b7bacae51effb95daf9f
Signed-off-by: Anaël Closson <ac2550@intl.att.com>

1 files changed, 15 insertions, 26 deletions

diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
index 044e3aa..b07c8c9 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-arquillian
@@ -5,14 +5,8 @@ FROM openecomp/wildfly:1.0
 MAINTAINER "The OpenECOMP Team"
 LABEL Description="This image contains the OpenECOMP MSO base for arquillian" Version="1.0"
 
-ARG chef_repo_branch_name
-ARG chef_repo_address
-ARG chef_repo_git_name
-ARG chef_repo_git_username
-ENV BRANCH_NAME=$chef_repo_branch_name
-ENV REPO_USERNAME=$chef_repo_git_username
-ENV REPO_ADDRESS=$chef_repo_address
-ENV CHEF_REPO_NAME=$chef_repo_git_name
+ENV CHEF_REPO_NAME="chef-repo"
+ENV CHEF_CONFIG_NAME="mso-config"
 
 ### Downloading dependencies
 
@@ -23,7 +17,6 @@ RUN chown -R jboss:jboss /tmp/jacoco
 ### Install Chef
 RUN dpkg -i chefdk_0.17.17-1_amd64.deb 
 
-COPY scripts/init-chef.sh /opt/mso/scripts/init-chef.sh
 COPY scripts/start-jboss-server.sh /opt/mso/scripts/start-jboss-server.sh
 
 RUN chown jboss:jboss /opt/mso/scripts/*
@@ -42,34 +35,30 @@ RUN mkdir /shared
 RUN chown jboss:jboss /shared
 
 # Setup chef folders
+RUN mkdir -p /var/chef/nodes
+RUN chown jboss:jboss /var/chef/nodes
 RUN mkdir /var/berks-cookbooks
 RUN chown jboss:jboss /var/berks-cookbooks
-COPY chef-configs/solo.rb /tmp/git/solo.rb
-RUN chown -R jboss:jboss /tmp/git/
+RUN mkdir -p /home/jboss/.chef/nodes
+RUN chown jboss:jboss /home/jboss/.chef/nodes
 
-COPY id_rsa /home/jboss/user
-RUN chmod 600 /home/jboss/user
-RUN chown -R jboss:jboss /home/jboss
+COPY chef-configs/${CHEF_REPO_NAME} /var/berks-cookbooks/${CHEF_REPO_NAME}
+COPY chef-configs/${CHEF_CONFIG_NAME} /var/berks-cookbooks/${CHEF_CONFIG_NAME}
+COPY chef-configs/solo.rb /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb
 
 # Start Chef config
-RUN mkdir -p /var/nodes
-RUN chown jboss:jboss /var/nodes
-
-RUN mkdir -p /home/jboss/.chef/nodes
-RUN mkdir /home/jboss/.ssh
+RUN sed "s/CHEF_REPO_NAME_TO_REPLACE/${CHEF_REPO_NAME}/g" -i /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb
+RUN chef-solo -c /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb -o recipe[mso-config::apih],recipe[mso-config::bpmn],recipe[mso-config::jra]
 
-
-RUN apt-get install -y git && sed -i "s@jboss:/bin/false@jboss:/bin/bash@g" /etc/passwd && su jboss -c "/opt/mso/scripts/init-chef.sh" && sed -i "s@jboss:/bin/bash@jboss:/bin/false@g" /etc/passwd && apt-get remove --purge -y git  && apt-get autoremove -y
-RUN rm -rf /home/jboss/.ssh
-RUN rm /home/jboss/user
+RUN mv /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker-init.json
 RUN echo "" > /shared/mso-docker.json
+RUN ln -s /shared/mso-docker.json /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json
+
+# Jacoco config
 RUN echo "" > /shared/jacoco-it.exec
 RUN ls -latr /
 RUN ls -latr /shared
 RUN chown jboss:jboss /shared/jacoco-it.exec
-RUN mv /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker-init.json
-RUN ln -s /shared/mso-docker.json /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json
-RUN rm -rf /tmp/git
 
 ## Create the log folder for MSO
 RUN mkdir -p /var/log/ecomp/MSO/