From 1f096fd2834715f51b505b22b4394a5f07d6979e Mon Sep 17 00:00:00 2001 From: David Giffin Date: Wed, 12 Feb 2020 21:02:20 -0800 Subject: [PATCH 1/5] Tim and scoot --- result/views/index.html | 4 ++-- vote/app.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/result/views/index.html b/result/views/index.html index 2844ad87b1..2d35253304 100644 --- a/result/views/index.html +++ b/result/views/index.html @@ -20,12 +20,12 @@
-
City Bears
+
Tim
{{aPercent | number:1}}%
-
Country Bears
+
Scoot
{{bPercent | number:1}}%
diff --git a/vote/app.py b/vote/app.py index 9ff841c9d4..78c969ea7c 100644 --- a/vote/app.py +++ b/vote/app.py @@ -5,8 +5,8 @@ import random import json -option_a = os.getenv('OPTION_A', "City Bears") -option_b = os.getenv('OPTION_B', "Country Bears") +option_a = os.getenv('OPTION_A', "Tim") +option_b = os.getenv('OPTION_B', "Scoot") hostname = socket.gethostname() app = Flask(__name__) From 092e2018ebc469fe66044fc5e5ac14cd92993d79 Mon Sep 17 00:00:00 2001 From: David Giffin Date: Fri, 21 Feb 2020 18:29:59 -0800 Subject: [PATCH 2/5] chim! --- result/views/index.html | 2 +- vote/app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/result/views/index.html b/result/views/index.html index 2d35253304..acb238f7f8 100644 --- a/result/views/index.html +++ b/result/views/index.html @@ -20,7 +20,7 @@
-
Tim
+
Chim
{{aPercent | number:1}}%
diff --git a/vote/app.py b/vote/app.py index 78c969ea7c..fa91dc0ca2 100644 --- a/vote/app.py +++ b/vote/app.py @@ -5,7 +5,7 @@ import random import json -option_a = os.getenv('OPTION_A', "Tim") +option_a = os.getenv('OPTION_A', "Chim") option_b = os.getenv('OPTION_B', "Scoot") hostname = socket.gethostname() From 8bcb0e7ff69a24861f1020b98dfaaed968428e24 Mon Sep 17 00:00:00 2001 From: David Giffin Date: Sun, 1 Mar 2020 22:33:58 -0800 Subject: [PATCH 3/5] hieee --- result/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/result/Dockerfile b/result/Dockerfile index 4ab503bd54..3374fb1359 100644 --- a/result/Dockerfile +++ b/result/Dockerfile @@ -10,6 +10,8 @@ RUN npm ci \ && npm cache clean --force \ && mv /app/node_modules /node_modules +RUN echo "hieeeee" + COPY . . ENV PORT 80 From e8e6bec3bfee4b9e6bc8e75c6cf4f3305f1e10a1 Mon Sep 17 00:00:00 2001 From: David Giffin Date: Mon, 16 Mar 2020 13:26:18 -0700 Subject: [PATCH 4/5] chimmy! --- result/views/index.html | 4 ++-- vote/app.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/result/views/index.html b/result/views/index.html index acb238f7f8..428a669379 100644 --- a/result/views/index.html +++ b/result/views/index.html @@ -20,12 +20,12 @@
-
Chim
+
Chimmy
{{aPercent | number:1}}%
-
Scoot
+
Scootie
{{bPercent | number:1}}%
diff --git a/vote/app.py b/vote/app.py index fa91dc0ca2..d44b13344c 100644 --- a/vote/app.py +++ b/vote/app.py @@ -5,8 +5,8 @@ import random import json -option_a = os.getenv('OPTION_A', "Chim") -option_b = os.getenv('OPTION_B', "Scoot") +option_a = os.getenv('OPTION_A', "Chimmy") +option_b = os.getenv('OPTION_B', "Scootie") hostname = socket.gethostname() app = Flask(__name__) From a6b4696de3406b6513e187caa245799b60fad92a Mon Sep 17 00:00:00 2001 From: David Giffin Date: Mon, 16 Mar 2020 23:10:44 -0700 Subject: [PATCH 5/5] scoot and chim --- result/views/index.html | 4 ++-- vote/app.py | 4 ++-- worker/Dockerfile | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/result/views/index.html b/result/views/index.html index 428a669379..acb238f7f8 100644 --- a/result/views/index.html +++ b/result/views/index.html @@ -20,12 +20,12 @@
-
Chimmy
+
Chim
{{aPercent | number:1}}%
-
Scootie
+
Scoot
{{bPercent | number:1}}%
diff --git a/vote/app.py b/vote/app.py index d44b13344c..fa91dc0ca2 100644 --- a/vote/app.py +++ b/vote/app.py @@ -5,8 +5,8 @@ import random import json -option_a = os.getenv('OPTION_A', "Chimmy") -option_b = os.getenv('OPTION_B', "Scootie") +option_a = os.getenv('OPTION_A', "Chim") +option_b = os.getenv('OPTION_B', "Scoot") hostname = socket.gethostname() app = Flask(__name__) diff --git a/worker/Dockerfile b/worker/Dockerfile index 85c33a5e9e..5dfa719173 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -3,6 +3,7 @@ FROM maven:3.5-jdk-8-alpine AS build WORKDIR /code COPY pom.xml /code/pom.xml + RUN ["mvn", "dependency:resolve"] RUN ["mvn", "verify"]