From a026a13017a94b14e1ce5c856088512dbca5a900 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Wed, 19 Jan 2022 16:28:10 -0500 Subject: [PATCH 01/11] Test some changes --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 9a350f55f431..b4d3af5bea67 100644 --- a/README.md +++ b/README.md @@ -7,4 +7,3 @@ Helm Charts in this repo: - Are deployed by an umbrella chart in the [example-multiservice-deploy](https://github.com/codefresh-contrib/example-multiservice-deploy) GitOps repo - Should be versioned only when the structure of the chart changes (not for image tag changes) - this minimizes chart version sprawl - Image tags are referenced from Global values in the umbrella chart (image tag changes are versioned there) - From b5a0578d012e37b8ed695d361e42d90b2cba3c02 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Fri, 21 Jan 2022 13:53:42 -0500 Subject: [PATCH 02/11] Update style.css --- ctrlr/flaskr/static/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/flaskr/static/style.css b/ctrlr/flaskr/static/style.css index 0a77f9998160..ba9d1fdddd74 100644 --- a/ctrlr/flaskr/static/style.css +++ b/ctrlr/flaskr/static/style.css @@ -26,7 +26,7 @@ hr { } nav { - background: LemonChiffon; + background: Aquamarine; display: flex; align-items: center; padding: 0 0.5rem; From 4354738a327c2c91ba178f9d6fa0ca4765a5bcfc Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Fri, 21 Jan 2022 15:03:45 -0500 Subject: [PATCH 03/11] Update the style --- ctrlr/flaskr/static/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/flaskr/static/style.css b/ctrlr/flaskr/static/style.css index ba9d1fdddd74..019794b19881 100644 --- a/ctrlr/flaskr/static/style.css +++ b/ctrlr/flaskr/static/style.css @@ -26,7 +26,7 @@ hr { } nav { - background: Aquamarine; + background: Beige; display: flex; align-items: center; padding: 0 0.5rem; From 1c7badbcc09c082925d3c8a6f9e1d0cd1d470546 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Mon, 24 Jan 2022 15:23:47 -0500 Subject: [PATCH 04/11] Update Dockerfile --- ctrlr/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index df666f4c7f68..7a4c8d6a3bd2 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -1,5 +1,6 @@ FROM python:3.8.2-alpine3.11 +# Labels LABEL cf_account="salesdemo" \ source="https://github.com/codefresh-contrib/salesdemo-flaskr" From cd400bd3af72b3b1315d5ddc9efbe5fe30b23344 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Tue, 25 Jan 2022 08:53:58 -0500 Subject: [PATCH 05/11] Update Dockerfile --- ctrlr/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index 7a4c8d6a3bd2..c1fb3a6a34d5 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -6,6 +6,7 @@ LABEL cf_account="salesdemo" \ ENV FLASK_APP=flaskr ENV FLASK_ENV=development +ENV TEST=true COPY . /app From 5c5d9e8739ddade4c20c59623a9c262e2cd6a1ba Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Wed, 26 Jan 2022 08:48:26 -0500 Subject: [PATCH 06/11] Update Dockerfile --- ctrlr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index c1fb3a6a34d5..137a559a07bd 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -6,7 +6,7 @@ LABEL cf_account="salesdemo" \ ENV FLASK_APP=flaskr ENV FLASK_ENV=development -ENV TEST=true +ENV TEST=ducker COPY . /app From ed0c87960352057fb373c1a6702417f406885fd8 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Thu, 27 Jan 2022 14:14:02 -0500 Subject: [PATCH 07/11] Update Dockerfile --- ctrlr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index 137a559a07bd..1c089fb7e533 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -6,7 +6,7 @@ LABEL cf_account="salesdemo" \ ENV FLASK_APP=flaskr ENV FLASK_ENV=development -ENV TEST=ducker +ENV TEST=doda COPY . /app From dc40bf30bb04eab7763b9d060f94a4b9a652b3e5 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Mon, 31 Jan 2022 13:24:30 -0500 Subject: [PATCH 08/11] Update Dockerfile ENVs --- ctrlr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index 1c089fb7e533..75b6ea2d55e2 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -6,7 +6,7 @@ LABEL cf_account="salesdemo" \ ENV FLASK_APP=flaskr ENV FLASK_ENV=development -ENV TEST=doda +ENV TEST=init COPY . /app From 66667aa8ff919ba4b127df827962dc0b6605af59 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Mon, 31 Jan 2022 13:50:05 -0500 Subject: [PATCH 09/11] Add ENVs to Dockerfile --- ctrlr/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index 75b6ea2d55e2..bdd495eb0815 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -7,6 +7,7 @@ LABEL cf_account="salesdemo" \ ENV FLASK_APP=flaskr ENV FLASK_ENV=development ENV TEST=init +ENV TEST2=other COPY . /app From 7fc21eba388fefe4081ae00543ea39ee95b19cb0 Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Mon, 31 Jan 2022 14:00:28 -0500 Subject: [PATCH 10/11] Update background color --- ctrlr/flaskr/static/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctrlr/flaskr/static/style.css b/ctrlr/flaskr/static/style.css index 019794b19881..29bad8352ab5 100644 --- a/ctrlr/flaskr/static/style.css +++ b/ctrlr/flaskr/static/style.css @@ -1,6 +1,6 @@ html { font-family: sans-serif; - background: #eee; + background: #ddd; padding: 1rem; } From da4a7e3610adae5bb258ed8cda292f050452c7fb Mon Sep 17 00:00:00 2001 From: Jesse Antoszyk Date: Wed, 2 Feb 2022 14:03:16 -0500 Subject: [PATCH 11/11] Update Dockerfile --- ctrlr/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ctrlr/Dockerfile b/ctrlr/Dockerfile index bdd495eb0815..4da186be47d7 100644 --- a/ctrlr/Dockerfile +++ b/ctrlr/Dockerfile @@ -8,6 +8,7 @@ ENV FLASK_APP=flaskr ENV FLASK_ENV=development ENV TEST=init ENV TEST2=other +ENV TEST3=other2 COPY . /app