diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-05 09:06:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 09:06:33 -0400 |
| commit | 8539d242451d48f1bfb29d2ab957897cdae08160 (patch) | |
| tree | 8399c9b7e16563cf1b7ececab5e84ae9cae77952 /Dockerfile | |
| parent | ab90d5e3a883698aa92eb2c8127ef72426325add (diff) | |
| parent | 1cb46437d0f73c6cfa2648d755ff90277d005b83 (diff) | |
| download | openshift-8539d242451d48f1bfb29d2ab957897cdae08160.tar.gz openshift-8539d242451d48f1bfb29d2ab957897cdae08160.tar.bz2 openshift-8539d242451d48f1bfb29d2ab957897cdae08160.tar.xz openshift-8539d242451d48f1bfb29d2ab957897cdae08160.zip | |
Merge pull request #3720 from giuseppe/installer-system-container
Installer as a system container
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile index eecf3630b..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 && \ @@ -39,4 +45,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" ] |