From f6b0ef02cdcf8ca081eccaeccd1460b60fd1d140 Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 19:48:44 +0000
Subject: [PATCH 1/7] Use Traefik, hopefully

---
 .../CloudFormation/newsAppCloudFormation.yaml              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ContinuousIntegration/CloudFormation/newsAppCloudFormation.yaml b/ContinuousIntegration/CloudFormation/newsAppCloudFormation.yaml
index d2d089d..9652c2a 100644
--- a/ContinuousIntegration/CloudFormation/newsAppCloudFormation.yaml
+++ b/ContinuousIntegration/CloudFormation/newsAppCloudFormation.yaml
@@ -1,3 +1,4 @@
+---
 Description: News Application
 AWSTemplateFormatVersion: '2010-09-09'
 Parameters:
@@ -89,6 +90,12 @@ Resources:
               Value: release
             - Name: PORT
               Value: '3000'
+          DockerLabels:
+            traefik.enable: true
+            traefik.http.routers.news.entrypoints: web
+            traefik.http.routers.news.rule: "PathPrefix(`/news`) || PathPrefix(`/notifications`)"
+            traefik.http.services.news.loadbalancer.healthcheck.path: "/healthcheck"
+          LogConfiguration:
   service:
     Type: AWS::ECS::Service
     Properties:

From 4c05a5b342bb89d588834eb452dda74ae97b60dd Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:13:47 +0000
Subject: [PATCH 2/7] Upgrade python to 3.9

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ad0678e..259df31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "4.1"
+python: "3.9"
 sudo: required
 services:
   - docker

From 3799164999fcc1724ba855ef48cb82c1a85329db Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:17:04 +0000
Subject: [PATCH 3/7] Python selection logic is only available on language:
 python builds

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 259df31..ad0678e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "4.1"
-python: "3.9"
 sudo: required
 services:
   - docker

From d302f87ac8f8ac7ee738a53ad46ae272b1c18f3a Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:20:20 +0000
Subject: [PATCH 4/7] Upgrade all the way to Ubuntu 22.04

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

diff --git a/.travis.yml b/.travis.yml
index ad0678e..08b6ad1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+---
+dist: jammy
 language: node_js
 node_js:
   - "4.1"

From 2901cc046d67c57c9942ba0c924c90ed3886314a Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:28:10 +0000
Subject: [PATCH 5/7] try focal

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 08b6ad1..dad3ec5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 ---
-dist: jammy
+dist: focal
 language: node_js
 node_js:
   - "4.1"

From 83342eaf96b6e7eec69d955dbbd6141125d3f84a Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:32:29 +0000
Subject: [PATCH 6/7] Try using package infra

---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dad3ec5..08a473d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,16 @@ node_js:
 sudo: required
 services:
   - docker
+addons:
+  apt:
+    packages:
+      - awscli
 before_install:
   - chmod +x ./scripts/*.sh
-  - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
-  - unzip awscli-bundle.zip
-  - ./awscli-bundle/install -b ~/bin/aws
-  - export PATH=~/bin:$PATH
+  # - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
+  # - unzip awscli-bundle.zip
+  # - ./awscli-bundle/install -b ~/bin/aws
+  # - export PATH=~/bin:$PATH
 before_script:
   - aws ecr get-login --no-include-email --region eu-west-1 | sh
 script:

From f45505e5e777ea329fac6ea22fb233db7d7d3c60 Mon Sep 17 00:00:00 2001
From: Kyle Gordon <kyle@glasgownet.com>
Date: Thu, 15 Feb 2024 21:36:56 +0000
Subject: [PATCH 7/7] remove junk

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08a473d..1b895dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,7 @@ addons:
       - awscli
 before_install:
   - chmod +x ./scripts/*.sh
-  # - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
-  # - unzip awscli-bundle.zip
-  # - ./awscli-bundle/install -b ~/bin/aws
-  # - export PATH=~/bin:$PATH
+  - aws --version
 before_script:
   - aws ecr get-login --no-include-email --region eu-west-1 | sh
 script: