From 5a0fbce9ac64f7695df615e27438e8d5506250fa Mon Sep 17 00:00:00 2001
From: Max Watermolen <11069376+MaxwellDPS@users.noreply.github.com>
Date: Sun, 13 Mar 2022 12:56:18 -0500
Subject: [PATCH 01/19] Add .circleci/config.yml

---
 .circleci/config.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..6554e1f4
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,26 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  say-hello:
+    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+    docker:
+      - image: cimg/base:stable
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      - checkout
+      - run:
+          name: "Say hello"
+          command: "echo Hello, World!"
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  say-hello-workflow:
+    jobs:
+      - say-hello

From c312bfaa41273fcbef009de382335f436ee8ba5f Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:37:09 +0000
Subject: [PATCH 02/19] update circelci

---
 .circleci/config.yml | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6554e1f4..d62de973 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,26 +1,34 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
-version: 2.1
-
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+version: 2
 jobs:
-  say-hello:
-    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+  build:
+    working_directory: /app
     docker:
-      - image: cimg/base:stable
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+      - image: docker:17.05.0-ce-git
     steps:
       - checkout
+      - setup_remote_docker
       - run:
-          name: "Say hello"
-          command: "echo Hello, World!"
-
-# Invoke jobs via workflows
-# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
-workflows:
-  say-hello-workflow:
-    jobs:
-      - say-hello
+          name: Install dependencies
+          command: |
+            apk add --no-cache \
+              py-pip=9.0.0-r1
+            pip install \
+              docker-compose==1.12.0 \
+              awscli==1.11.76
+      - run:
+          name: Build trunkplayer-NG Docker image
+          command: |
+            docker build  -t maxwelldps/trunkplayer-ng:rolling .
+            docker build  -t maxwelldps/trunkplayer-ng:${CIRCLE_SHA1} .
+      - run:
+          name: Build nginx Docker image
+          command: |
+            docker build  -t maxwelldps/trunkplayer-ng-nginx:rolling nginx/
+            docker build  -t maxwelldps/trunkplayer-ng-nginx:${CIRCLE_SHA1} nginx/
+      - deploy:
+          name: Push application Docker image
+          command: |
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            docker push "maxwelldps/trunkplayer-ng-nginx:rolling"
+            docker push "maxwelldps/trunkplayer-ng:${CIRCLE_SHA1}"
+            
\ No newline at end of file

From 1516e27e98e468365b0add531b85e95697ed990e Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:47:53 +0000
Subject: [PATCH 03/19] updated circleci

---
 .circleci/config.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d62de973..6f75e7e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,12 @@
 version: 2
+orbs: # adds orbs to your configuration
+  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+workflows:
+  build:
+    jobs:
+      - build:
+          post-steps:
+            - jira/notify 
 jobs:
   build:
     working_directory: /app

From 8290e37652b31a3fd0f7ffe6141e3e16f6fae836 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:48:45 +0000
Subject: [PATCH 04/19] version: 2.1

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6f75e7e5..9cb2c527 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 orbs: # adds orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 workflows:

From 3e015ad5b44712d8150341475190ecd114e55447 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:53:58 +0000
Subject: [PATCH 05/19] fixed bad user

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9cb2c527..ad2e0a82 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,17 +26,17 @@ jobs:
       - run:
           name: Build trunkplayer-NG Docker image
           command: |
-            docker build  -t maxwelldps/trunkplayer-ng:rolling .
-            docker build  -t maxwelldps/trunkplayer-ng:${CIRCLE_SHA1} .
+            docker build  -t trunkplayer/trunkplayer-ng:rolling .
+            docker build  -t trunkplayer/trunkplayer-ng:${CIRCLE_SHA1} .
       - run:
           name: Build nginx Docker image
           command: |
-            docker build  -t maxwelldps/trunkplayer-ng-nginx:rolling nginx/
-            docker build  -t maxwelldps/trunkplayer-ng-nginx:${CIRCLE_SHA1} nginx/
+            docker build  -t trunkplayer/trunkplayer-ng-nginx:rolling nginx/
+            docker build  -t trunkplayer/trunkplayer-ng-nginx:${CIRCLE_SHA1} nginx/
       - deploy:
           name: Push application Docker image
           command: |
             docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker push "maxwelldps/trunkplayer-ng-nginx:rolling"
-            docker push "maxwelldps/trunkplayer-ng:${CIRCLE_SHA1}"
+            docker push "trunkplayer/trunkplayer-ng-nginx:rolling"
+            docker push "trunkplayer/trunkplayer-ng:${CIRCLE_SHA1}"
             
\ No newline at end of file

From d3644d974351c4a481de167f6bb158209b7ed039 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:56:38 +0000
Subject: [PATCH 06/19] FIXED BRANCHES

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad2e0a82..206901b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,17 +26,17 @@ jobs:
       - run:
           name: Build trunkplayer-NG Docker image
           command: |
-            docker build  -t trunkplayer/trunkplayer-ng:rolling .
+            docker build  -t trunkplayer/trunkplayer-ng:${CIRCLE_BRANCH} .
             docker build  -t trunkplayer/trunkplayer-ng:${CIRCLE_SHA1} .
       - run:
           name: Build nginx Docker image
           command: |
-            docker build  -t trunkplayer/trunkplayer-ng-nginx:rolling nginx/
+            docker build  -t trunkplayer/trunkplayer-ng-nginx:${CIRCLE_BRANCH} nginx/
             docker build  -t trunkplayer/trunkplayer-ng-nginx:${CIRCLE_SHA1} nginx/
       - deploy:
           name: Push application Docker image
           command: |
             docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker push "trunkplayer/trunkplayer-ng-nginx:rolling"
+            docker push "trunkplayer/trunkplayer-ng-nginx:${CIRCLE_BRANCH}"
             docker push "trunkplayer/trunkplayer-ng:${CIRCLE_SHA1}"
             
\ No newline at end of file

From 4bdf3895e764d40f26d9d796d3a3df297d509953 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:57:57 +0000
Subject: [PATCH 07/19] add jq

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 206901b4..bbc9bd2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,10 +19,12 @@ jobs:
           name: Install dependencies
           command: |
             apk add --no-cache \
-              py-pip=9.0.0-r1
+              py-pip=9.0.0-r1 \
+              jq
             pip install \
               docker-compose==1.12.0 \
               awscli==1.11.76
+
       - run:
           name: Build trunkplayer-NG Docker image
           command: |

From 118e1bd16ca1794f503f57fbd562af72b7d7311f Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:58:46 +0000
Subject: [PATCH 08/19] aqhhh

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bbc9bd2c..90c51747 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,6 +21,7 @@ jobs:
             apk add --no-cache \
               py-pip=9.0.0-r1 \
               jq
+              curl
             pip install \
               docker-compose==1.12.0 \
               awscli==1.11.76

From e4ac08cddb8fcdae6d7a1c63ead004e07b87670a Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Sun, 13 Mar 2022 23:59:25 +0000
Subject: [PATCH 09/19] again

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90c51747..52287073 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
+            apk update && \
             apk add --no-cache \
               py-pip=9.0.0-r1 \
               jq

From 6e0f814308d44e12c7429629410e8b9f1c26c8e2 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:01:13 +0000
Subject: [PATCH 10/19] doi

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52287073..34cf425f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
             apk update && \
             apk add --no-cache \
               py-pip=9.0.0-r1 \
-              jq
+              jq \
               curl
             pip install \
               docker-compose==1.12.0 \

From 8e579511a82a56a941db416e3f38a34bc31693fd Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:02:56 +0000
Subject: [PATCH 11/19] doi

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 34cf425f..a3569d58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs: # adds orbs to your configuration
-  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+  jira: circleci/jira@1.3.1 # invokes the Jira orb, making its commands accessible
 workflows:
   build:
     jobs:

From 12c1c8122d841d6f0082fb4f372f953c9ec64c6e Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:08:02 +0000
Subject: [PATCH 12/19] ahh

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a3569d58..9cc6e63e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,8 +18,8 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            apk update && \
-            apk add --no-cache \
+            apk update && apk upgrade && \
+            apk add  --upgrade --no-cache \
               py-pip=9.0.0-r1 \
               jq \
               curl

From 46e94c21b2a87c2fa4ff68b3a515f74969a0d0af Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:08:44 +0000
Subject: [PATCH 13/19] ahh

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9cc6e63e..8cfaef5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     working_directory: /app
     docker:
-      - image: docker:17.05.0-ce-git
+      - image: docker:20.10-git
     steps:
       - checkout
       - setup_remote_docker

From fc1f877faa91e79666dd0ce78c93d8a3a9937665 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:08:52 +0000
Subject: [PATCH 14/19] a

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8cfaef5b..f31a9d09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            apk update && apk upgrade && \
+            apk update && \
             apk add  --upgrade --no-cache \
               py-pip=9.0.0-r1 \
               jq \

From 98dd323aef9ffa3bae85ae49d73815d8c3518fb1 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:09:57 +0000
Subject: [PATCH 15/19] doi

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f31a9d09..014ccdf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ jobs:
             apk update && \
             apk add  --upgrade --no-cache \
               py-pip=9.0.0-r1 \
-              jq \
-              curl
+              curl \
+              jq               
             pip install \
               docker-compose==1.12.0 \
               awscli==1.11.76

From 6669b0dc444943e40bc5b4b7dab653b46b8e51ba Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:10:46 +0000
Subject: [PATCH 16/19] zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

---
 trunkplayerNG/radio/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunkplayerNG/radio/views.py b/trunkplayerNG/radio/views.py
index de28fca4..6255721d 100644
--- a/trunkplayerNG/radio/views.py
+++ b/trunkplayerNG/radio/views.py
@@ -3053,7 +3053,7 @@ def get(self, request):
         global_email_templates = GlobalEmailTemplate.objects.all()
 
         page = self.paginate_queryset(global_email_templates)
-        if page is not None:
+a        if page is not None:
             serializer = GlobalEmailTemplateSerializer(global_email_templates, many=True)
             return Response(serializer.data)
 

From 201a9ff433de4d3ddb64f1fbf5995bc4d6e2a2f8 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 00:11:04 +0000
Subject: [PATCH 17/19] darn cat

---
 .circleci/config.yml         | 5 ++---
 trunkplayerNG/radio/views.py | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 014ccdf7..00de9781 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,12 +20,11 @@ jobs:
           command: |
             apk update && \
             apk add  --upgrade --no-cache \
-              py-pip=9.0.0-r1 \
+              py-pip \
               curl \
               jq               
             pip install \
-              docker-compose==1.12.0 \
-              awscli==1.11.76
+              docker-compose
 
       - run:
           name: Build trunkplayer-NG Docker image
diff --git a/trunkplayerNG/radio/views.py b/trunkplayerNG/radio/views.py
index 6255721d..de28fca4 100644
--- a/trunkplayerNG/radio/views.py
+++ b/trunkplayerNG/radio/views.py
@@ -3053,7 +3053,7 @@ def get(self, request):
         global_email_templates = GlobalEmailTemplate.objects.all()
 
         page = self.paginate_queryset(global_email_templates)
-a        if page is not None:
+        if page is not None:
             serializer = GlobalEmailTemplateSerializer(global_email_templates, many=True)
             return Response(serializer.data)
 

From 0293e70d2739d7fac011a187b1cb5b05db3d22ad Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 13:13:52 +0000
Subject: [PATCH 18/19] maybe

---
 .circleci/config.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 00de9781..e7ad14d5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,12 +20,8 @@ jobs:
           command: |
             apk update && \
             apk add  --upgrade --no-cache \
-              py-pip \
               curl \
-              jq               
-            pip install \
-              docker-compose
-
+              jq  
       - run:
           name: Build trunkplayer-NG Docker image
           command: |

From 11ae6ca5aa9645a1773b092e151f57f98269ae93 Mon Sep 17 00:00:00 2001
From: Max Watermolen <maxw@maxwelldps.com>
Date: Mon, 14 Mar 2022 23:29:35 +0000
Subject: [PATCH 19/19] push

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7ad14d5..6db4cf7e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,16 +26,14 @@ jobs:
           name: Build trunkplayer-NG Docker image
           command: |
             docker build  -t trunkplayer/trunkplayer-ng:${CIRCLE_BRANCH} .
-            docker build  -t trunkplayer/trunkplayer-ng:${CIRCLE_SHA1} .
       - run:
           name: Build nginx Docker image
           command: |
             docker build  -t trunkplayer/trunkplayer-ng-nginx:${CIRCLE_BRANCH} nginx/
-            docker build  -t trunkplayer/trunkplayer-ng-nginx:${CIRCLE_SHA1} nginx/
       - deploy:
           name: Push application Docker image
           command: |
             docker login -u $DOCKER_USER -p $DOCKER_PASS
             docker push "trunkplayer/trunkplayer-ng-nginx:${CIRCLE_BRANCH}"
-            docker push "trunkplayer/trunkplayer-ng:${CIRCLE_SHA1}"
+            docker push "trunkplayer/trunkplayer-ng:${CIRCLE_BRANCH}"
             
\ No newline at end of file