From 83c7d85ee3a82daa2759c3e8c0e69c5856eed5fe Mon Sep 17 00:00:00 2001
From: Peter Valdez <peter@nycmesh.net>
Date: Wed, 23 Oct 2019 20:12:47 -0400
Subject: [PATCH 1/5] Add the Shipyard routes for the vote and result services

---
 docker-compose.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5417f7cf6b..137b8c30c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,11 @@
 version: "3"
 
 services:
+
   vote:
+    labels:
+      shipyard.route: '/vote'
+      shipyard.rewrite: true
     build: ./vote
     command: python app.py
     volumes:
@@ -13,6 +17,9 @@ services:
       - back-tier
 
   result:
+    labels:
+      shipyard.route: '/result'
+      shipyard.rewrite: true
     build: ./result
     command: nodemon server.js
     volumes:
@@ -53,4 +60,4 @@ volumes:
 
 networks:
   front-tier:
-  back-tier:
\ No newline at end of file
+  back-tier:

From d0fa42e4a4fbec6fcaaf1806ec3c7819c9e63818 Mon Sep 17 00:00:00 2001
From: Peter Valdez <peter@nycmesh.net>
Date: Wed, 23 Oct 2019 21:14:24 -0400
Subject: [PATCH 2/5] Add the postgres port

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 137b8c30c6..1cd048ff94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,8 @@ services:
       - "db-data:/var/lib/postgresql/data"
     networks:
       - back-tier
+    ports:
+      - 5432
 
 volumes:
   db-data:

From 4fa6b6b63d4682395dd3f6de4b83c4225cb7a536 Mon Sep 17 00:00:00 2001
From: Peter Valdez <peter@nycmesh.net>
Date: Thu, 24 Oct 2019 12:48:21 -0400
Subject: [PATCH 3/5] Rename the Shipyard rewrite label

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1cd048ff94..478bcd4244 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   vote:
     labels:
       shipyard.route: '/vote'
-      shipyard.rewrite: true
+      shipyard.route.rewrite: true
     build: ./vote
     command: python app.py
     volumes:
@@ -19,7 +19,7 @@ services:
   result:
     labels:
       shipyard.route: '/result'
-      shipyard.rewrite: true
+      shipyard.route.rewrite: true
     build: ./result
     command: nodemon server.js
     volumes:

From 423e8950875076d14f942a8c9509f28edecde7aa Mon Sep 17 00:00:00 2001
From: Peter Valdez <peter@nycmesh.net>
Date: Thu, 24 Oct 2019 18:02:56 -0400
Subject: [PATCH 4/5] Use https for jquery

---
 vote/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vote/templates/index.html b/vote/templates/index.html
index fb58924dc7..13aae10091 100644
--- a/vote/templates/index.html
+++ b/vote/templates/index.html
@@ -26,7 +26,7 @@ <h3>{{option_a}} vs {{option_b}}!</h3>
         </div>
       </div>
     </div>
-    <script src="http://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
+    <script src="https://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.js"></script>
 
     {% if vote %}

From 6f55dc4f0e5add93e1684155d4eb09b2be3c8115 Mon Sep 17 00:00:00 2001
From: Rogerio Shieh Barbosa <40327446+rogerioshieh@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:08:50 -0400
Subject: [PATCH 5/5] add PGDATA env var to db container

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 478bcd4244..633a0abfaf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,8 @@ services:
   db:
     image: postgres:9.4
     container_name: db
+    environment:
+      PGDATA: '/var/lib/postgresql/data/pgdata'
     volumes:
       - "db-data:/var/lib/postgresql/data"
     networks: