remove assemble script

openshift · Jul 13, 2017 · e7407e5 · e7407e5
1 parent 47977c5
commit e7407e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 48 deletions.
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
@@ -55,11 +55,7 @@ ENV PLAYBOOK_FILE=playbooks/byo/openshift_facts.yml \
 
 # playbook2image's assemble script expects the source to be available in
 # /tmp/src (as per the source-to-image specs) so we import it there
-ADD . /tmp/src
-
-# Running the 'assemble' script will install
-# dependencies specified in requirements.txt
-RUN /usr/bin/assemble
+ADD . ${APP_HOME}
 
 WORKDIR ${APP_HOME}
 ENTRYPOINT [ "/usr/bin/entrypoint" ]

diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7
@@ -14,7 +14,6 @@ LABEL name="openshift3/ose-ansible" \
       architecture="x86_64"
 
 # Playbooks, roles and their dependencies are installed from packages.
-# Unlike in Dockerfile, we don't invoke the 'assemble' script here
 USER root
 RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto skopeo openssl java-1.8.0-openjdk-headless httpd-tools" && \
     yum repolist > /dev/null && \
@@ -49,9 +48,6 @@ ENV USER_NAME=default \
 # The playbook to be run is specified via the PLAYBOOK_FILE env var.
 # This sets a default of openshift_facts.yml as it's an informative playbook
 # that can help test that everything is set properly (inventory, sshkeys).
-# As the playbooks are installed via packages instead of being copied to
-# $APP_HOME by the 'assemble' script, we set the WORK_DIR env var to the
-# location of openshift-ansible.
 ENV PLAYBOOK_FILE=playbooks/byo/openshift_facts.yml \
     ANSIBLE_CONFIG=/usr/share/atomic-openshift-utils/ansible.cfg \
     WORK_DIR=/usr/share/ansible/openshift-ansible \

diff --git a/images/installer/bin/assemble b/images/installer/bin/assemble
diff --git a/images/installer/bin/run b/images/installer/bin/run
@@ -15,11 +15,11 @@ if [[ -v INVENTORY_FILE ]]; then
   # contains a dynamic inventory and we use it directly.
   # Otherwise we make a copy so that ALLOW_ANSIBLE_CONNECTION_LOCAL below
   # does not attempt to modify the original
-  if [[ -x ${INVENTORY_FILE} ]]; then
-    INVENTORY="${INVENTORY_FILE}"
-  else
-    cp ${INVENTORY_FILE} ${INVENTORY}
-  fi
+  #if [[ -x ${INVENTORY_FILE} ]]; then
+  #  INVENTORY="${INVENTORY_FILE}"
+  #else
+  cp ${INVENTORY_FILE} ${INVENTORY}
+  #fi
 elif [[ -v INVENTORY_URL ]]; then
   curl -o ${INVENTORY} ${INVENTORY_URL}
 elif [[ -v DYNAMIC_SCRIPT_URL ]]; then