From faf1ca28a20a88d818d711ee5bc1b4a90b0b5a80 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:23:37 -0700
Subject: [PATCH 1/8] added a comments

---
 src/tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tasks.py b/src/tasks.py
index b993590..31797cc 100644
--- a/src/tasks.py
+++ b/src/tasks.py
@@ -10,6 +10,7 @@
 ###########################################
 # Library functions
 
+# Isaiah changes to the file
 # Create a logger object 
 logger = logging.getLogger(__name__)
 def _set_log_level(verbose=0) -> None:

From 85581566ec0d0d1984df10ba787c8d5268387501 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:33:27 -0700
Subject: [PATCH 2/8] created a docker-compose_deploy file

---
 docker-composer_deploy.yaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docker-composer_deploy.yaml

diff --git a/docker-composer_deploy.yaml b/docker-composer_deploy.yaml
new file mode 100644
index 0000000..ce564c3
--- /dev/null
+++ b/docker-composer_deploy.yaml
@@ -0,0 +1,16 @@
+# this is the file used to deploy on Portainer
+# or other more permanent hosting solutions
+version: "3.7"
+
+services:
+  myapp:
+    container_name: myapp
+    image: toolbox:latest
+    build: .
+    ports:
+      - "9111:8080"
+    volumes:
+      - "app_data2:/var/app_data2"
+
+volumes:
+  app_data2:

From 3b1afb9188b676bacd19855f4f4241f35432e0ea Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:35:43 -0700
Subject: [PATCH 3/8] removed the docker-compose_deploy file

---
 docker-composer_deploy.yaml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 docker-composer_deploy.yaml

diff --git a/docker-composer_deploy.yaml b/docker-composer_deploy.yaml
deleted file mode 100644
index ce564c3..0000000
--- a/docker-composer_deploy.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# this is the file used to deploy on Portainer
-# or other more permanent hosting solutions
-version: "3.7"
-
-services:
-  myapp:
-    container_name: myapp
-    image: toolbox:latest
-    build: .
-    ports:
-      - "9111:8080"
-    volumes:
-      - "app_data2:/var/app_data2"
-
-volumes:
-  app_data2:

From 365d54312078a84b4339ad2fe42694c55fc12c64 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:38:48 -0700
Subject: [PATCH 4/8] created a docker-compose_deploy file

---
 docker-compose_deploy.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 docker-compose_deploy.yml

diff --git a/docker-compose_deploy.yml b/docker-compose_deploy.yml
new file mode 100644
index 0000000..74b1425
--- /dev/null
+++ b/docker-compose_deploy.yml
@@ -0,0 +1,16 @@
+# this is the file used to deploy on Portainer
+# or other more permanent hosting solutions
+version: "3.7"
+
+services:
+  myapp:
+    container_name: myapp
+    image: dockerstepbystep:latest
+    build: .
+    ports:
+      - "8080:8080"
+    volumes:
+      - "app_data2:/var/app_data2"
+
+volumes:
+  app_data2:

From c11e95475ab64907e4de15658bffeec106fe0ec8 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:42:51 -0700
Subject: [PATCH 5/8] changed configs

---
 docker-compose_deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose_deploy.yml b/docker-compose_deploy.yml
index 74b1425..bda1717 100644
--- a/docker-compose_deploy.yml
+++ b/docker-compose_deploy.yml
@@ -4,11 +4,11 @@ version: "3.7"
 
 services:
   myapp:
-    container_name: myapp
-    image: dockerstepbystep:latest
+    container_name: ensf400Lab
+    image: toolbox:latest
     build: .
     ports:
-      - "8080:8080"
+      - "9111:8080"
     volumes:
       - "app_data2:/var/app_data2"
 

From 61b00eaaba65dc757437c5fb48e2a85b39c983ef Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:50:58 -0700
Subject: [PATCH 6/8] changed depoly yaml

---
 docker-compose_deploy.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/docker-compose_deploy.yml b/docker-compose_deploy.yml
index bda1717..ce5c386 100644
--- a/docker-compose_deploy.yml
+++ b/docker-compose_deploy.yml
@@ -1,16 +1,20 @@
-# this is the file used to deploy on Portainer
-# or other more permanent hosting solutions
-version: "3.7"
+version: '3.8'
 
 services:
   myapp:
-    container_name: ensf400Lab
-    image: toolbox:latest
-    build: .
-    ports:
-      - "9111:8080"
+    container_name: myapp_subbranch
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: ghcr.io/growlf/toolbox:testing
+    environment:
+      - TESTVAR=${TESTVAR:-app}
+    stdin_open: true
+    tty: true
+    command: ["/bin/zsh"]
     volumes:
-      - "app_data2:/var/app_data2"
-
-volumes:
-  app_data2:
+      - ${HOME}/.gitconfig:/home/ubuntu/.gitconfig
+      - ${HOME}/.ssh:/home/ubuntu/.ssh
+      - ${PWD}:/app
+      - /var/run/docker.sock:/var/run/docker.sock
+    network_mode: "host"

From e1e6dafb731902b586cb1517291cf63a65c67d37 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:54:44 -0700
Subject: [PATCH 7/8] changed depoly yaml

---
 docker-compose_deploy.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docker-compose_deploy.yml b/docker-compose_deploy.yml
index ce5c386..c5c2c2a 100644
--- a/docker-compose_deploy.yml
+++ b/docker-compose_deploy.yml
@@ -1,20 +1,13 @@
-version: '3.8'
-
 services:
-  myapp:
-    container_name: myapp_subbranch
+  # Building and testing environment
+  app:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/growlf/toolbox:testing
-    environment:
-      - TESTVAR=${TESTVAR:-app}
+    image: ghcr.io/growlf/toolbox:lastest
     stdin_open: true
     tty: true
     command: ["/bin/zsh"]
     volumes:
-      - ${HOME}/.gitconfig:/home/ubuntu/.gitconfig
-      - ${HOME}/.ssh:/home/ubuntu/.ssh
-      - ${PWD}:/app
       - /var/run/docker.sock:/var/run/docker.sock
     network_mode: "host"

From 3511d6673bd7a6a2db081d1f6dd12a36a110b184 Mon Sep 17 00:00:00 2001
From: IsaiahA21 <76446914+IsaiahA21@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:55:32 -0700
Subject: [PATCH 8/8] changed depoly yaml

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

diff --git a/docker-compose_deploy.yml b/docker-compose_deploy.yml
index c5c2c2a..9a416a1 100644
--- a/docker-compose_deploy.yml
+++ b/docker-compose_deploy.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: ghcr.io/growlf/toolbox:lastest
+    image: ghcr.io/growlf/toolbox:latest
     stdin_open: true
     tty: true
     command: ["/bin/zsh"]