From a2574bfdb614fabda1bbe521abdd019d21fa5706 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Tue, 14 Aug 2018 11:24:12 -0700 Subject: [PATCH 1/9] breaking image --- templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login.html b/templates/login.html index 38e76950d..cd26bdbbb 100644 --- a/templates/login.html +++ b/templates/login.html @@ -5,7 +5,7 @@ <% block class %>lcb-login animated fadeIn<% endblock %> <% block attributes %> - style="background-image: url('./media/img/photos/<$ photo $>');" + style="background-image: url('./whoops/media/img/photos/<$ photo $>');" <% endblock %> <% block js %> From 7bc716ed7ed3c22ba45a6db31fc3a30ca0a1408b Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Tue, 14 Aug 2018 11:32:38 -0700 Subject: [PATCH 2/9] adding clair config file --- clair-config.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 clair-config.yml diff --git a/clair-config.yml b/clair-config.yml new file mode 100644 index 000000000..f8c4ea511 --- /dev/null +++ b/clair-config.yml @@ -0,0 +1,11 @@ +General: + clair_url: 'URL' + verify: false +Plugins: + Docker: + class: paclair.plugins.docker_plugin.DockerPlugin + registries: + REGISTRY: + auth: + - "USERNAME" + - "PASSWORD" From 97cfbad1a32ca935bb0b6911ca3bbeaecef34398 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Tue, 14 Aug 2018 13:50:07 -0700 Subject: [PATCH 3/9] fix image --- templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login.html b/templates/login.html index cd26bdbbb..38e76950d 100644 --- a/templates/login.html +++ b/templates/login.html @@ -5,7 +5,7 @@ <% block class %>lcb-login animated fadeIn<% endblock %> <% block attributes %> - style="background-image: url('./whoops/media/img/photos/<$ photo $>');" + style="background-image: url('./media/img/photos/<$ photo $>');" <% endblock %> <% block js %> From 20718d4b90d8c526aca6b0b1adad9d2d7feff89b Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Tue, 14 Aug 2018 14:04:41 -0700 Subject: [PATCH 4/9] break image --- templates/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login.html b/templates/login.html index 38e76950d..cd26bdbbb 100644 --- a/templates/login.html +++ b/templates/login.html @@ -5,7 +5,7 @@ <% block class %>lcb-login animated fadeIn<% endblock %> <% block attributes %> - style="background-image: url('./media/img/photos/<$ photo $>');" + style="background-image: url('./whoops/media/img/photos/<$ photo $>');" <% endblock %> <% block js %> From 3914e5158d4ec3aa10b7a061e16cacfcdbc5ad99 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Mon, 22 Oct 2018 11:14:41 -0700 Subject: [PATCH 5/9] updating for test --- deploy/kube-app.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/kube-app.yml b/deploy/kube-app.yml index 29b344fc3..b688d4355 100644 --- a/deploy/kube-app.yml +++ b/deploy/kube-app.yml @@ -5,6 +5,7 @@ metadata: name: demo-chat labels: service: demo-chat + revision: ${{CF_REVISION}} spec: replicas: 1 template: @@ -13,7 +14,7 @@ spec: service: demo-chat spec: containers: - - image: ${{build_step}} + - image: ${{BuildingDockerImage}} name: app imagePullPolicy: Always ports: From 29bda6668b2644516f672e0ef8127f64c8ac885f Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Mon, 22 Oct 2018 11:19:04 -0700 Subject: [PATCH 6/9] removing money symbol --- deploy/kube-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/kube-app.yml b/deploy/kube-app.yml index b688d4355..cf35354e5 100644 --- a/deploy/kube-app.yml +++ b/deploy/kube-app.yml @@ -5,7 +5,7 @@ metadata: name: demo-chat labels: service: demo-chat - revision: ${{CF_REVISION}} + revision: {{CF_REVISION}} spec: replicas: 1 template: @@ -14,7 +14,7 @@ spec: service: demo-chat spec: containers: - - image: ${{BuildingDockerImage}} + - image: {{BuildingDockerImage}} name: app imagePullPolicy: Always ports: From a1c1f37f45db6bf87cf7e427010b7eb1097241a8 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Mon, 22 Oct 2018 11:22:40 -0700 Subject: [PATCH 7/9] testing --- deploy/kube-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kube-app.yml b/deploy/kube-app.yml index cf35354e5..b95cf9f5a 100644 --- a/deploy/kube-app.yml +++ b/deploy/kube-app.yml @@ -14,7 +14,7 @@ spec: service: demo-chat spec: containers: - - image: {{BuildingDockerImage}} + - image: r.cfcr.io/{{CF_REPO_OWNER}}/{{CF_REPO_NAME}}:{{CF_SHORT_REVISION}} name: app imagePullPolicy: Always ports: From cab45fd8005faa2dba62b5a01839770194e65773 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Mon, 22 Oct 2018 11:36:50 -0700 Subject: [PATCH 8/9] updating for correct repo --- deploy/kube-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kube-app.yml b/deploy/kube-app.yml index b95cf9f5a..9b783ae92 100644 --- a/deploy/kube-app.yml +++ b/deploy/kube-app.yml @@ -14,7 +14,7 @@ spec: service: demo-chat spec: containers: - - image: r.cfcr.io/{{CF_REPO_OWNER}}/{{CF_REPO_NAME}}:{{CF_SHORT_REVISION}} + - image: r.cfcr.io/dustinvanbuskirk/{{CF_REPO_OWNER}}/{{CF_REPO_NAME}}:{{CF_SHORT_REVISION}} name: app imagePullPolicy: Always ports: From b4521f49121e0152f5138f411bb005013ff04fd1 Mon Sep 17 00:00:00 2001 From: Dustin Van Buskirk Date: Mon, 22 Oct 2018 11:44:27 -0700 Subject: [PATCH 9/9] editing --- deploy/kube-app.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/kube-app.yml b/deploy/kube-app.yml index 9b783ae92..69f0dfa91 100644 --- a/deploy/kube-app.yml +++ b/deploy/kube-app.yml @@ -13,8 +13,10 @@ spec: labels: service: demo-chat spec: + imagePullSecrets: + - name: {{PULL_SECRET}} containers: - - image: r.cfcr.io/dustinvanbuskirk/{{CF_REPO_OWNER}}/{{CF_REPO_NAME}}:{{CF_SHORT_REVISION}} + - image: r.cfcr.io/{{CF_REPO_OWNER}}/{{CF_REPO_NAME}}:{{CF_SHORT_REVISION}} name: app imagePullPolicy: Always ports: