bcgov · RobertGoesByJim · Apr 17, 2018 · Apr 19, 2018 · Apr 20, 2018 · Apr 20, 2018
diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
diff --git a/.s2i/bin/run b/.s2i/bin/run
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,7 @@ node('master') {
     // run the oc build to package the artifacts into a docker image
     openshiftBuild bldCfg: APP_NAME, showBuildLogs: 'true', verbose: 'true'
 
-    // openshiftBuild bldCfg: CADDY_BUILD_CONFIG, showBuildLogs: 'true', verbose: 'true'
+    openshiftBuild bldCfg: CADDY_BUILD_CONFIG, showBuildLogs: 'true', verbose: 'true'
 
     // Don't tag with BUILD_ID so the pruner can do it's job; it won't delete tagged images.
     // Tag the images for deployment based on the image's hash

diff --git a/_in-practice-examples/aged-out.md b/_in-practice-examples/aged-out.md
@@ -7,7 +7,7 @@ example-of: Put your user and their needs at the centre of your design
 
 ### Impact
 
-Agedout.com uses modern, interactive technology to guide users through “Quests.” As the youth proceed through the quests, they earn badges for their learning. Youth are then able to put the badges towards real life rewards, such as computers from Best Buy. \[Metrics forthcoming.\] This approach has the potential to expand to other Ministries, the Quests functionality and methodology being shared with partners in an example of gov-as-a-platform.
+Agedout.com uses modern, interactive technology to guide users through “Quests.” As the youth proceed through the quests, they earn badges for their learning. Youth are then able to put the badges towards real life rewards, such as computers from Best Buy. \[Metrics forthcoming.\] This approach has the potential to expand to other Ministries, the Quests functionality and methodology being shared with partners in an example of gov-as-a-platform...
 
 ### Partners
 

diff --git a/openshift/templates/README.md b/openshift/templates/README.md
@@ -1,6 +1,6 @@
 ## Deployment Flow:
 
-Update in the `develop` branch will trigger Jenkins pipeline:
+Update in the `os-pages` branch will trigger Jenkins pipeline:
 1. Checkout the source from Github
 2. Build images:
 

diff --git a/openshift/templates/digital-toolkit-build.json b/openshift/templates/digital-toolkit-build.json
@@ -5,18 +5,15 @@
         "name": "innovation-toolkit",
         "creationTimestamp": null
     },
-    "labels": {
-        "template":"toolkit-jekyll"
-    },
     "objects": [
         {
             "kind": "BuildConfig",
             "apiVersion": "v1",
             "metadata": {
-                "name": "${NAME}-jekyll${NAME_SUFFIX}",
+                "name": "innovation-toolkit",
                 "creationTimestamp": null,
                 "labels": {
-                    "app": "${APP_NAME}"
+                    "app": "innovation-toolkit"
                 },
                 "annotations": {
                     "openshift.io/generated-by": "OpenShiftNewApp"
@@ -49,22 +46,22 @@
                     "type": "Git",
                     "git": {
                         "uri": "https://github.com/bcgov/digital-toolkit.git",
-                        "ref": "develop"
+                        "ref": "os-pages"
                     }
                 },
                 "strategy": {
                     "type": "Docker",
                     "dockerStrategy": {
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "ruby:2.3.0-alpine"
+                            "name": "docker-registry.default.svc:5000/ocio-guides-tools/ruby:2.3.0-alpine"
                         }
                     }
                 },
                 "output": {
                     "to": {
                         "kind": "ImageStreamTag",
-                        "name": "${NAME}-jekyll${NAME_SUFFIX}:latest"
+                        "name": "innovation-toolkit-jekyll:latest"
                     }
                 },
                 "resources": {
@@ -88,11 +85,11 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "${NAME}",
+                "name": "innovation-toolkit-jekyll",
                 "generation": 1,
                 "creationTimestamp": null,
                 "labels": {
-                    "app": "${APP_NAME}"
+                    "app": "innovation-toolkit"
                 },
                 "annotations": {
                     "openshift.io/generated-by": "OpenShiftNewApp"
@@ -108,7 +105,7 @@
                         "annotations": null,
                         "from": {
                             "kind": "DockerImage",
-                            "name": "172.50.0.2:5000/guides/innovation-toolkit:latest"
+                            "name": "172.50.0.2:5000/ocio-guides-tools/innovation-toolkit-jekyll:latest"
                         },
                         "generation": null,
                         "importPolicy": {},
@@ -122,26 +119,5 @@
                 "dockerImageRepository": ""
             }
         }
-    ],
-    "parameters": [
-        {
-            "name": "APP_NAME",
-            "displayName": "Name",
-            "description": "Application name used for grouping objects in the openshift console. You should keep this as default unless your know what your doing.",
-            "required": true,
-            "value": "innovation-toolkit"
-        },{
-            "name": "NAME",
-            "displayName": "Name",
-            "description": "The name assigned to all of the objects defined in this template. You should keep this as default unless your know what your doing.",
-            "required": true,
-            "value": "innovation-toolkit"
-        },{
-            "name": "NAME_SUFFIX",
-            "displayName": "Name",
-            "description": "The suffix for all created objects",
-            "required": false,
-            "value": ""
-        }
     ]
-}
+}
diff --git a/openshift/templates/digital-toolkit-caddy-build.json b/openshift/templates/digital-toolkit-caddy-build.json
@@ -47,16 +47,16 @@
                 "runPolicy": "Serial",
                 "source": {
                     "type": "Dockerfile",
-                    "dockerfile": "FROM bcgov-s2i-caddy\nCOPY _site /var/www/html/",
+                    "dockerfile": "FROM bcgov-s2i-caddy\nCOPY /toolkit/_site /var/www/html/",
                     "images": [
                         {
                             "from": {
                                 "kind": "ImageStreamTag",
-                                "name": "${NAME}-jekyll${NAME_SUFFIX}:latest"
+                                "name": "innovation-toolkit-jekyll:latest"
                             },
                             "paths": [
                                 {
-                                    "sourcePath": "/opt/app-root/src/_site",
+                                    "sourcePath": "/toolkit",
                                     "destinationDir": "./"
                                 }
                             ]

diff --git a/openshift/templates/digital-toolkit-deploy-prod.json b/openshift/templates/digital-toolkit-deploy-prod.json
@@ -0,0 +1,142 @@
+{
+    "kind": "Template",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "innovation-toolkit-caddy",
+        "creationTimestamp": null
+    },
+    "objects": [
+        {
+            "kind": "DeploymentConfig",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "innovation-toolkit-caddy",
+                "generation": 1,
+                "creationTimestamp": null,
+                "labels": {
+                    "app": "innovation-toolkit-caddy"
+                },
+                "annotations": {
+                    "openshift.io/generated-by": "OpenShiftWebConsole"
+                }
+            },
+            "spec": {
+                "strategy": {
+                    "type": "Rolling",
+                    "rollingParams": {
+                        "updatePeriodSeconds": 1,
+                        "intervalSeconds": 1,
+                        "timeoutSeconds": 600,
+                        "maxUnavailable": "25%",
+                        "maxSurge": "25%"
+                    },
+                    "resources": {},
+                    "activeDeadlineSeconds": 21600
+                },
+                "triggers": [
+                    {
+                        "type": "ConfigChange"
+                    },
+                    {
+                        "type": "ImageChange",
+                        "imageChangeParams": {
+                            "automatic": true,
+                            "containerNames": [
+                                "innovation-toolkit-caddy"
+                            ],
+                            "from": {
+                                "kind": "ImageStreamTag",
+                                "namespace": "ocio-guides-tools",
+                                "name": "innovation-toolkit-caddy:prod"
+                            }
+                        }
+                    }
+                ],
+                "replicas": 1,
+                "test": false,
+                "selector": {
+                    "app": "innovation-toolkit-caddy",
+                    "deploymentconfig": "innovation-toolkit-caddy"
+                },
+                "template": {
+                    "metadata": {
+                        "creationTimestamp": null,
+                        "labels": {
+                            "app": "innovation-toolkit-caddy",
+                            "deploymentconfig": "innovation-toolkit-caddy"
+                        },
+                        "annotations": {
+                            "openshift.io/generated-by": "OpenShiftWebConsole"
+                        }
+                    },
+                    "spec": {
+                        "containers": [
+                            {
+                                "name": "innovation-toolkit-caddy",
+                                "image": "docker-registry.default.svc:5000/ocio-guides-tools/innovation-toolkit-caddy@sha256:b3cbedf2a2f40521a1dc94280f67a5d68635ce095f03f0b587b48b410919842b",
+                                "args": [
+                                  "/tmp/scripts/run"
+                                ],
+                                "ports": [
+                                    {
+                                        "containerPort": 2015,
+                                        "protocol": "TCP"
+                                    }
+                                ],
+                                "resources": {},
+                                "terminationMessagePath": "/dev/termination-log",
+                                "terminationMessagePolicy": "File",
+                                "imagePullPolicy": "Always"
+                            }
+                        ],
+                        "restartPolicy": "Always",
+                        "terminationGracePeriodSeconds": 30,
+                        "dnsPolicy": "ClusterFirst",
+                        "securityContext": {},
+                        "schedulerName": "default-scheduler"
+                    }
+                }
+            },
+            "status": {
+                "latestVersion": 0,
+                "observedGeneration": 0,
+                "replicas": 0,
+                "updatedReplicas": 0,
+                "availableReplicas": 0,
+                "unavailableReplicas": 0
+            }
+        },
+        {
+            "kind": "Service",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "innovation-toolkit-caddy",
+                "creationTimestamp": null,
+                "labels": {
+                    "app": "innovation-toolkit-caddy"
+                },
+                "annotations": {
+                    "openshift.io/generated-by": "OpenShiftWebConsole"
+                }
+            },
+            "spec": {
+                "ports": [
+                    {
+                        "name": "2015-tcp",
+                        "protocol": "TCP",
+                        "port": 2015,
+                        "targetPort": 2015
+                    }
+                ],
+                "selector": {
+                    "deploymentconfig": "innovation-toolkit-caddy"
+                },
+                "type": "ClusterIP",
+                "sessionAffinity": "None"
+            },
+            "status": {
+                "loadBalancer": {}
+            }
+        }
+    ]
+}