Browse Source

Merge pull request #3961 from codificat/qe-container-doc

Merged by openshift-bot
OpenShift Bot 8 years ago
parent
commit
4a553433d1
3 changed files with 52 additions and 28 deletions
  1. 22 4
      BUILD.md
  2. 2 2
      CONTRIBUTING.md
  3. 28 22
      README_CONTAINER_IMAGE.md

+ 22 - 4
BUILD.md

@@ -1,12 +1,11 @@
-# openshift-ansible RPM Build instructions
+# openshift-ansible build instructions
+
+## Build openshift-ansible RPMs
 
 We use tito to make building and tracking revisions easy.
 
 For more information on tito, please see the [Tito home page](https://github.com/dgoodwin/tito "Tito home page").
 
-
-## Build openshift-ansible
-
 - Change into openshift-ansible
 ```
 cd openshift-ansible
@@ -24,3 +23,22 @@ tito tag
 ```
 tito build --rpm
 ```
+
+## Build an openshift-ansible container image
+
+To build a container image of `openshift-ansible` using standalone **Docker**:
+
+        cd openshift-ansible
+        docker build -t openshift/openshift-ansible .
+
+Alternatively this can be built using on **OpenShift** using a [build and image stream](https://docs.openshift.org/latest/architecture/core_concepts/builds_and_image_streams.html) with this command:
+
+        oc new-build docker.io/aweiteka/playbook2image~https://github.com/openshift/openshift-ansible
+
+The progress of the build can be monitored with:
+
+        oc logs -f bc/openshift-ansible
+
+Once built, the image will be visible in the Image Stream created by the same command:
+
+        oc describe imagestream openshift-ansible

+ 2 - 2
CONTRIBUTING.md

@@ -66,9 +66,9 @@ These are plugins used in playbooks and roles:
 └── test                Contains tests.
 ```
 
-## Building RPMs
+## Building openshift-ansible RPMs and container images
 
-See the [RPM build instructions](BUILD.md).
+See the [build instructions in BUILD.md](BUILD.md).
 
 ## Running tests
 

File diff suppressed because it is too large
+ 28 - 22
README_CONTAINER_IMAGE.md