Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 4a7c7e1

Browse files
jonathanbelljonathanbell
committed
Merge branch 'draft-edits'
2 parents 0bfcda0 + 4d3e7e1 commit 4a7c7e1

7 files changed

Lines changed: 327 additions & 26 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.5.0-alpine
1+
FROM ruby:2.3.0-alpine
22
MAINTAINER jonathanbell <jonathanbell.ca@gmail.com>
33

44
RUN apk update && \

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ exclude:
9292
- LICENCE
9393
- README.md
9494
- Dockerfile
95-
- webpack.config.js
95+
- openshift/
9696
- sync-local-dev.bash # workfile that syncs local to dev site

‎_guides/enterprise-business-architecture/WhatDoesDigitalMean.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
front matter here...
2+
3+
-----
4+
5+
Digital Government involves the use of digital technologies, as an integrated part of governments’ modernization strategies, to create public value. Digital Government allows the distinctions between technology and the business it supports to dissolve. Technology is no longer separate from the organization’s business; rather it’s integrated into how government delivers programs and services.

‎openshift/templates/digital-toolkit-build.json‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
{
2+
"kind": "Template",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "innovation-toolkit",
6+
"creationTimestamp": null
7+
},
8+
"objects": [
9+
{
10+
"kind": "BuildConfig",
11+
"apiVersion": "v1",
12+
"metadata": {
13+
"name": "innovation-toolkit",
14+
"creationTimestamp": null,
15+
"labels": {
16+
"app": "innovation-toolkit"
17+
},
18+
"annotations": {
19+
"openshift.io/generated-by": "OpenShiftNewApp"
20+
}
21+
},
22+
"spec": {
23+
"triggers": [
24+
{
25+
"type": "GitHub",
26+
"github": {
27+
"secret": "lV9ORp60uSu62DrZaOqy"
28+
}
29+
},
30+
{
31+
"type": "Generic",
32+
"generic": {
33+
"secret": "YbHwPKG_p40Uro7mpsch"
34+
}
35+
},
36+
{
37+
"type": "ImageChange",
38+
"imageChange": {}
39+
},
40+
{
41+
"type": "ConfigChange"
42+
}
43+
],
44+
"runPolicy": "Serial",
45+
"source": {
46+
"type": "Git",
47+
"git": {
48+
"uri": "https://github.com/bcgov/digital-toolkit.git",
49+
"ref": "os-pages"
50+
}
51+
},
52+
"strategy": {
53+
"type": "Docker",
54+
"dockerStrategy": {
55+
"from": {
56+
"kind": "ImageStreamTag",
57+
"name": "ruby:2.3.0-alpine"
58+
}
59+
}
60+
},
61+
"output": {
62+
"to": {
63+
"kind": "ImageStreamTag",
64+
"name": "innovation-toolkit:latest"
65+
}
66+
},
67+
"resources": {
68+
"limits": {
69+
"cpu": "2",
70+
"memory": "2Gi"
71+
},
72+
"requests": {
73+
"cpu": "1",
74+
"memory": "1Gi"
75+
}
76+
},
77+
"postCommit": {},
78+
"nodeSelector": null
79+
},
80+
"status": {
81+
"lastVersion": 0
82+
}
83+
},
84+
{
85+
"kind": "ImageStream",
86+
"apiVersion": "v1",
87+
"metadata": {
88+
"name": "innovation-toolkit",
89+
"generation": 1,
90+
"creationTimestamp": null,
91+
"labels": {
92+
"app": "innovation-toolkit"
93+
},
94+
"annotations": {
95+
"openshift.io/generated-by": "OpenShiftNewApp"
96+
}
97+
},
98+
"spec": {
99+
"lookupPolicy": {
100+
"local": false
101+
},
102+
"tags": [
103+
{
104+
"name": "latest",
105+
"annotations": null,
106+
"from": {
107+
"kind": "DockerImage",
108+
"name": "172.50.0.2:5000/guides/innovation-toolkit:latest"
109+
},
110+
"generation": null,
111+
"importPolicy": {},
112+
"referencePolicy": {
113+
"type": ""
114+
}
115+
}
116+
]
117+
},
118+
"status": {
119+
"dockerImageRepository": ""
120+
}
121+
}
122+
]
123+
}

‎openshift/templates/digital-toolkit-deploy.json‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"kind": "Template",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "innovation-toolkit",
6+
"creationTimestamp": null
7+
},
8+
"objects": [
9+
{
10+
"kind": "DeploymentConfig",
11+
"apiVersion": "v1",
12+
"metadata": {
13+
"name": "innovation-toolkit",
14+
"generation": 1,
15+
"creationTimestamp": null,
16+
"labels": {
17+
"app": "innovation-toolkit"
18+
},
19+
"annotations": {
20+
"openshift.io/generated-by": "OpenShiftNewApp"
21+
}
22+
},
23+
"spec": {
24+
"strategy": {
25+
"type": "Rolling",
26+
"rollingParams": {
27+
"updatePeriodSeconds": 1,
28+
"intervalSeconds": 1,
29+
"timeoutSeconds": 600,
30+
"maxUnavailable": "25%",
31+
"maxSurge": "25%"
32+
},
33+
"resources": {},
34+
"activeDeadlineSeconds": 21600
35+
},
36+
"triggers": [
37+
{
38+
"type": "ConfigChange"
39+
},
40+
{
41+
"type": "ImageChange",
42+
"imageChangeParams": {
43+
"automatic": true,
44+
"containerNames": [
45+
"innovation-toolkit"
46+
],
47+
"from": {
48+
"kind": "ImageStreamTag",
49+
"namespace": "guides",
50+
"name": "innovation-toolkit:latest"
51+
}
52+
}
53+
}
54+
],
55+
"replicas": 1,
56+
"test": false,
57+
"selector": {
58+
"app": "innovation-toolkit",
59+
"deploymentconfig": "innovation-toolkit"
60+
},
61+
"template": {
62+
"metadata": {
63+
"creationTimestamp": null,
64+
"labels": {
65+
"app": "innovation-toolkit",
66+
"deploymentconfig": "innovation-toolkit"
67+
},
68+
"annotations": {
69+
"openshift.io/generated-by": "OpenShiftNewApp"
70+
}
71+
},
72+
"spec": {
73+
"containers": [
74+
{
75+
"name": "innovation-toolkit",
76+
"image": "172.50.0.2:5000/guides/innovation-toolkit@sha256:e2da593f8d590abd8e4e94217aa189815960e46e64891f306b87574e6be8c56c",
77+
"ports": [
78+
{
79+
"containerPort": 4000,
80+
"protocol": "TCP"
81+
}
82+
],
83+
"resources": {},
84+
"terminationMessagePath": "/dev/termination-log",
85+
"terminationMessagePolicy": "File",
86+
"imagePullPolicy": "Always"
87+
}
88+
],
89+
"restartPolicy": "Always",
90+
"terminationGracePeriodSeconds": 30,
91+
"dnsPolicy": "ClusterFirst",
92+
"securityContext": {},
93+
"schedulerName": "default-scheduler"
94+
}
95+
}
96+
},
97+
"status": {
98+
"latestVersion": 0,
99+
"observedGeneration": 0,
100+
"replicas": 0,
101+
"updatedReplicas": 0,
102+
"availableReplicas": 0,
103+
"unavailableReplicas": 0
104+
}
105+
},
106+
{
107+
"kind": "Service",
108+
"apiVersion": "v1",
109+
"metadata": {
110+
"name": "innovation-toolkit",
111+
"creationTimestamp": null,
112+
"labels": {
113+
"app": "innovation-toolkit"
114+
},
115+
"annotations": {
116+
"openshift.io/generated-by": "OpenShiftNewApp"
117+
}
118+
},
119+
"spec": {
120+
"ports": [
121+
{
122+
"name": "4000-tcp",
123+
"protocol": "TCP",
124+
"port": 4000,
125+
"targetPort": 4000
126+
}
127+
],
128+
"selector": {
129+
"app": "innovation-toolkit",
130+
"deploymentconfig": "innovation-toolkit"
131+
},
132+
"type": "ClusterIP",
133+
"sessionAffinity": "None"
134+
},
135+
"status": {
136+
"loadBalancer": {}
137+
}
138+
}
139+
]
140+
}

‎openshift/templates/digital-toolkit-route.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"kind": "Template",
3+
"apiVersion": "v1",
4+
"metadata": {
5+
"name": "innovation-toolkit",
6+
"creationTimestamp": null
7+
},
8+
"objects": [
9+
{
10+
"kind": "Route",
11+
"apiVersion": "v1",
12+
"metadata": {
13+
"name": "digital-toolkit",
14+
"creationTimestamp": null,
15+
"labels": {
16+
"app": "innovation-toolkit"
17+
},
18+
"annotations": {
19+
"haproxy.router.openshift.io/ip_whitelist": "142.0.0.0/8",
20+
"haproxy.router.openshift.io/timeout": "180s"
21+
}
22+
},
23+
"spec": {
24+
"host": "digital-toolkit.pathfinder.gov.bc.ca",
25+
"to": {
26+
"kind": "Service",
27+
"name": "innovation-toolkit",
28+
"weight": 100
29+
},
30+
"port": {
31+
"targetPort": "4000-tcp"
32+
},
33+
"tls": {
34+
"termination": "edge",
35+
"insecureEdgeTerminationPolicy": "Redirect"
36+
},
37+
"wildcardPolicy": "None"
38+
},
39+
"status": {
40+
"ingress": [
41+
{
42+
"host": "digital-toolkit.pathfinder.gov.bc.ca",
43+
"routerName": "router",
44+
"conditions": [
45+
{
46+
"type": "Admitted",
47+
"status": "True",
48+
"lastTransitionTime": "2018-03-07T23:51:50Z"
49+
}
50+
],
51+
"wildcardPolicy": "None"
52+
}
53+
]
54+
}
55+
}
56+
]
57+
}

‎webpack.config.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)