summaryrefslogtreecommitdiffstats
path: root/README_CONTAINER_IMAGE.md
diff options
context:
space:
mode:
authorPep TurrĂ³ Mauri <pep@redhat.com>2017-05-12 14:26:00 +0200
committerPep TurrĂ³ Mauri <pep@redhat.com>2017-05-12 19:03:59 +0200
commit4f95f55b60d48eabfcf69e9828e6fd655b3683c4 (patch)
treee0bb8c079c547c659d89622b701c04f63e273efe /README_CONTAINER_IMAGE.md
parent57185bdd2415d4bbdeb6d18dfdaea65d0c440ae1 (diff)
downloadopenshift-4f95f55b60d48eabfcf69e9828e6fd655b3683c4.tar.gz
openshift-4f95f55b60d48eabfcf69e9828e6fd655b3683c4.tar.bz2
openshift-4f95f55b60d48eabfcf69e9828e6fd655b3683c4.tar.xz
openshift-4f95f55b60d48eabfcf69e9828e6fd655b3683c4.zip
Fix container image build references
Updating some files to account for recent changes: - Commit fbadeb4 moved the location of the Dockerfiles - playbook2image is now available from the openshift org - downstream image is building with boto 2.34 Adjusting image build scripts and documentation to match these changes.
Diffstat (limited to 'README_CONTAINER_IMAGE.md')
-rw-r--r--README_CONTAINER_IMAGE.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README_CONTAINER_IMAGE.md b/README_CONTAINER_IMAGE.md
index b78073100..e8e6efb79 100644
--- a/README_CONTAINER_IMAGE.md
+++ b/README_CONTAINER_IMAGE.md
@@ -1,6 +1,6 @@
# Containerized openshift-ansible to run playbooks
-The [Dockerfile](Dockerfile) in this repository uses the [playbook2image](https://github.com/aweiteka/playbook2image) source-to-image base image to containerize `openshift-ansible`. The resulting image can run any of the provided playbooks. See [BUILD.md](BUILD.md) for image build instructions.
+The [Dockerfile](images/installer/Dockerfile) in this repository uses the [playbook2image](https://github.com/openshift/playbook2image) source-to-image base image to containerize `openshift-ansible`. The resulting image can run any of the provided playbooks. See [BUILD.md](BUILD.md) for image build instructions.
The image is designed to **run as a non-root user**. The container's UID is mapped to the username `default` at runtime. Therefore, the container's environment reflects that user's settings, and the configuration should match that. For example `$HOME` is `/opt/app-root/src`, so ssh keys are expected to be under `/opt/app-root/src/.ssh`. If you ran a container as `root` you would have to adjust the container's configuration accordingly, e.g. by placing ssh keys under `/root/.ssh` instead. Nevertheless, the expectation is that containers will be run as non-root; for example, this container image can be run inside OpenShift under the default `restricted` [security context constraint](https://docs.openshift.org/latest/architecture/additional_concepts/authorization.html#security-context-constraints).
@@ -8,7 +8,7 @@ The image is designed to **run as a non-root user**. The container's UID is mapp
## Usage
-The `playbook2image` base image provides several options to control the behaviour of the containers. For more details on these options see the [playbook2image](https://github.com/aweiteka/playbook2image) documentation.
+The `playbook2image` base image provides several options to control the behaviour of the containers. For more details on these options see the [playbook2image](https://github.com/openshift/playbook2image) documentation.
At the very least, when running a container you must specify: