From 28c75e6e5c02ee0c796d378846c2ad8f7a3a8c22 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 16 Mar 2017 17:17:10 +0100 Subject: installer: support running as a system container Example: atomic install --system --set INVENTORY_FILE=$(pwd)/hosts.inventory \ --set SSH_ROOT=/root/.ssh \ --set PLAYBOOK_FILE=./playbooks/byo/config.yml openshift-ansible Signed-off-by: Giuseppe Scrivano --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index eecf3630b..33ca69e1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,4 +39,7 @@ ADD . /tmp/src # as per the INSTALL_OC environment setting above RUN /usr/libexec/s2i/assemble +# Add files for running as a system container +COPY system-container/root / + CMD [ "/usr/libexec/s2i/run" ] -- cgit v1.2.3 From 1cb46437d0f73c6cfa2648d755ff90277d005b83 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 2 May 2017 11:47:38 +0200 Subject: Dockerfile: create symlink for /opt/app-root/src and point it to /usr/share/ansible/openshift-ansible so that the file paths for this image are the same as for the Dockerfile.rhel7 image. Signed-off-by: Giuseppe Scrivano --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 33ca69e1f..1df887f32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,12 @@ LABEL name="openshift-ansible" \ USER root +# Create a symlink to /opt/app-root/src so that files under /usr/share/ansible are accessible. +# This is required since the system-container uses by default the playbook under +# /usr/share/ansible/openshift-ansible. With this change we won't need to keep two different +# configurations for the two images. +RUN mkdir -p /usr/share/ansible/ && ln -s /opt/app-root/src /usr/share/ansible/openshift-ansible + RUN INSTALL_PKGS="skopeo" && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ -- cgit v1.2.3