diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-05-02 11:47:38 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-05-03 13:01:50 +0200 |
| commit | 1cb46437d0f73c6cfa2648d755ff90277d005b83 (patch) | |
| tree | f58ef6926b00c55191e6fc467596750f1bf05b53 | |
| parent | e49fa92f03031f1a2ceb8efe279a00609b0980f1 (diff) | |
| download | openshift-1cb46437d0f73c6cfa2648d755ff90277d005b83.tar.gz openshift-1cb46437d0f73c6cfa2648d755ff90277d005b83.tar.bz2 openshift-1cb46437d0f73c6cfa2648d755ff90277d005b83.tar.xz openshift-1cb46437d0f73c6cfa2648d755ff90277d005b83.zip | |
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 <gscrivan@redhat.com>
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 6 insertions, 0 deletions
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 && \ |