From 99067d79a7b2694af23224f5af4ce032ae289b64 Mon Sep 17 00:00:00 2001
From: Jaime Ramírez <jaime.ramirez@redhat.com>
Date: Tue, 16 Jun 2020 10:30:40 +0200
Subject: [PATCH] docs(adopt-a-pup): Add CI/CD info to readme (#52)

---
 adopt-a-pup/web-app/README.md |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/adopt-a-pup/web-app/README.md b/adopt-a-pup/web-app/README.md
index c46287a..949f9c4 100644
--- a/adopt-a-pup/web-app/README.md
+++ b/adopt-a-pup/web-app/README.md
@@ -84,15 +84,25 @@
 
 You don���t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn���t feel obligated to use this feature. However we understand that this tool wouldn���t be useful if you couldn���t customize it when you are ready for it.
 
-## Container image generation for production
+## Container image generation
 
-You can generate production images for `1.0` and `2.0` version of the application.
+In a dev environment, you can generate production images for `1.0` and `2.0` version of the application.
 
 To build `1.0`, run `./scripts/build_image_v1`.
 
 To build `2.0`, run `./scripts/build_image_v2`.
 
-To push the generated images to quay, run `podman push quay.io/redhattraining/ossm-adopt-a-pup-webapp`.
+If you want to manually push the generated images to quay, run `podman push quay.io/redhattraining/ossm-adopt-a-pup-webapp`.
+
+## Jenkins CI: Automatic container image deployment to Quay.io
+
+This project runs a Jenkins pipeline (see `Jenkinsfile`) for continuous integration and delivery.
+
+In master, the pipeline includes a release step that builds the app bundle, builds the container image and [pushes it to quay](https://quay.io/repository/redhattraining/ossm-adopt-a-pup-webapp) automatically. This step requires manual confirmation. The pipeline waits for confirmation for 5 minutes. The deployment is skipped if not confirmed within that interval. However, you can always rerun the pipeline and confirm the deployment later.
+
+To confirm the deployment, use the master branch pipeline view in Jenkins.
+
+The deployed quay image is [quay.io/redhattraining/ossm-adopt-a-pup-webapp](https://quay.io/repository/redhattraining/ossm-adopt-a-pup-webapp).
 
 ## Learn More
 

--
Gitblit v1.9.3