From f38810a41cd427e7febf82bd01c53849771d0682 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:03:30 +1100
Subject: [PATCH 01/40] dockerfile, makefile and edits to workflow yml

---
 .../workflows/chisholm-ray_c05-actions02.yml  | 45 +++++++++++++++++++
 chisholm-ray/actions02/Dockerfile             |  2 +
 chisholm-ray/actions02/Makefile               | 16 +++++++
 3 files changed, 63 insertions(+)
 create mode 100644 .github/workflows/chisholm-ray_c05-actions02.yml
 create mode 100644 chisholm-ray/actions02/Dockerfile
 create mode 100644 chisholm-ray/actions02/Makefile

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
new file mode 100644
index 0000000..53b6d02
--- /dev/null
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -0,0 +1,45 @@
+
+on:
+  pull_request:
+  paths:
+      - 'chisholm-ray/**'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: checkout repo
+      uses: actions/checkout@v2
+
+    - name: set variables
+      run: |
+        echo "SHORT_SHA=`git rev-parse HEAD | head -c 7`" >> $GITHUB_ENV
+        echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
+
+    - name: docker login
+      with:
+        CCR_DOCKERP: ${{ secrets.CCR_DOCKERP}}
+      env:
+        CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
+      run: make login
+
+    - name: build image
+      run: make build
+
+    - name: push image
+      run: make push
+
+  comment_pr:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Comment PR
+      uses: thollander/actions-comment-pull-request@v1
+
+      with:
+        message: 'Image name ${{ env.IMAGEFULLNAME }} has been pushed to dockerhub'
+        GITHUB_TOKEN: ${{ secrets.CCR_GITHUB_TOKEN}}
+      
\ No newline at end of file
diff --git a/chisholm-ray/actions02/Dockerfile b/chisholm-ray/actions02/Dockerfile
new file mode 100644
index 0000000..4fa049a
--- /dev/null
+++ b/chisholm-ray/actions02/Dockerfile
@@ -0,0 +1,2 @@
+  FROM httpd:2.4.51
+  RUN echo "This is my GH actions exercise" > /usr/local/apache2/htdocs/index.html
\ No newline at end of file
diff --git a/chisholm-ray/actions02/Makefile b/chisholm-ray/actions02/Makefile
new file mode 100644
index 0000000..1109917
--- /dev/null
+++ b/chisholm-ray/actions02/Makefile
@@ -0,0 +1,16 @@
+#vars
+
+
+.PHONY: build push login 
+
+build:
+		@echo "Building image with tag ${IMAGEFULLNAME}"
+	    @docker build -t ${IMAGEFULLNAME} -f chisholm-ray/actions02/Dockerfile .
+
+push:
+		@echo "Pushing image with tag ${IMAGEFULLNAME} to DockerHub"
+	    @docker image push ${IMAGEFULLNAME}
+
+login:
+		@echo "Logging into DockerHub with provided credentials"
+		@docker login -u ${CCR_DOCKERU} --password-stdin 
\ No newline at end of file

From 74a3eddc91d4c0ce8d00c3141a5263bd92b0c5e8 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:07:23 +1100
Subject: [PATCH 02/40] edit workflow yml

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 53b6d02..d144709 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -2,7 +2,7 @@
 on:
   pull_request:
   paths:
-      - 'chisholm-ray/**'
+      - 'chisholm-ray/actions02/**'
 
 jobs:
   docker:

From ba121b2023adc85cd218f2dd92e5cf75ebc690bf Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:12:59 +1100
Subject: [PATCH 03/40] edit workflow yml

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index d144709..941780d 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -1,7 +1,8 @@
+name: 3M workflow with comment on PR
 
 on:
   pull_request:
-  paths:
+    paths:
       - 'chisholm-ray/actions02/**'
 
 jobs:

From 4c32f5a9f66da2f79f277d58d48cdaa20bb6850b Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:19:55 +1100
Subject: [PATCH 04/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 941780d..3663e0a 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -2,7 +2,7 @@ name: 3M workflow with comment on PR
 
 on:
   pull_request:
-    paths:
+  paths:
       - 'chisholm-ray/actions02/**'
 
 jobs:
@@ -10,8 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: checkout repo
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v2  
 
     - name: set variables
       run: |

From 3d4aac6985d51a1141c84df3bd32a45fcc0950d8 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:34:52 +1100
Subject: [PATCH 05/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 3663e0a..841bcbf 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -2,8 +2,8 @@ name: 3M workflow with comment on PR
 
 on:
   pull_request:
-  paths:
-      - 'chisholm-ray/actions02/**'
+    paths:
+    - 'chisholm-ray/actions02/**'
 
 jobs:
   docker:

From c199b0b6f7fadb633d651781f4d79c40c3af1fb0 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:50:22 +1100
Subject: [PATCH 06/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 841bcbf..411dc5a 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -3,10 +3,10 @@ name: 3M workflow with comment on PR
 on:
   pull_request:
     paths:
-    - 'chisholm-ray/actions02/**'
+      - 'chisholm-ray/actions02/**'
 
 jobs:
-  docker:
+  build:
     runs-on: ubuntu-latest
     steps:
 
@@ -18,11 +18,15 @@ jobs:
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login
-      with:
-        CCR_DOCKERP: ${{ secrets.CCR_DOCKERP}}
+      run: |
+        make login
       env:
         CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
-      run: make login
+      with:
+        CCR_DOCKERP: ${{ secrets.CCR_DOCKERP }}
+
+
+
 
     - name: build image
       run: make build

From 2cad789d4b15bb73819db75334448a14fb9fe428 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 08:58:44 +1100
Subject: [PATCH 07/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 411dc5a..081dab4 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -9,8 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-
-    - uses: actions/checkout@v2  
+    - name: checkout repo
+      uses: actions/checkout@v2  
 
     - name: set variables
       run: |
@@ -18,12 +18,13 @@ jobs:
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login
-      run: |
-        make login
-      env:
-        CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
       with:
         CCR_DOCKERP: ${{ secrets.CCR_DOCKERP }}
+      env:
+        CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
+      run: |
+        make login
+
 
 
 

From 9190d1af14d6e71f260ea1e8327f8d5454505408 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:09:13 +1100
Subject: [PATCH 08/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 081dab4..3492d6b 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -9,15 +9,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: checkout repo
-      uses: actions/checkout@v2  
+    - uses: actions/checkout@v2  
 
     - name: set variables
       run: |
         echo "SHORT_SHA=`git rev-parse HEAD | head -c 7`" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
-    - name: docker login
+    - name: docker login 
       with:
         CCR_DOCKERP: ${{ secrets.CCR_DOCKERP }}
       env:
@@ -25,10 +24,6 @@ jobs:
       run: |
         make login
 
-
-
-
-
     - name: build image
       run: make build
 

From dde353a9eaa859f418bfe66d6cbf7b7c4d7388f0 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:18:41 +1100
Subject: [PATCH 09/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 +--
 chisholm-ray/actions02/Makefile                  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 3492d6b..e9dbb52 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -17,10 +17,9 @@ jobs:
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 
-      with:
-        CCR_DOCKERP: ${{ secrets.CCR_DOCKERP }}
       env:
         CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
+        CCR_DOCKERP: ${{ secrets.CCR_DOCKERP }}
       run: |
         make login
 
diff --git a/chisholm-ray/actions02/Makefile b/chisholm-ray/actions02/Makefile
index 1109917..ceb1c05 100644
--- a/chisholm-ray/actions02/Makefile
+++ b/chisholm-ray/actions02/Makefile
@@ -13,4 +13,4 @@ push:
 
 login:
 		@echo "Logging into DockerHub with provided credentials"
-		@docker login -u ${CCR_DOCKERU} --password-stdin 
\ No newline at end of file
+		@docker login -u ${CCR_DOCKERU} -p ${CCR_DOCKERP}
\ No newline at end of file

From 75e5a66a1bc440b21c96945332e96f51c4f14ee1 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:21:19 +1100
Subject: [PATCH 10/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index e9dbb52..80fdd28 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -8,6 +8,11 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+        working-directory: chisholm-ray/actions02/
+
     steps:
     - uses: actions/checkout@v2  
 

From 763394123a54ff3b0ad6db9df0303fd066829baf Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:24:59 +1100
Subject: [PATCH 11/40] wdits

---
 chisholm-ray/actions02/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chisholm-ray/actions02/Makefile b/chisholm-ray/actions02/Makefile
index ceb1c05..e7b13cd 100644
--- a/chisholm-ray/actions02/Makefile
+++ b/chisholm-ray/actions02/Makefile
@@ -13,4 +13,4 @@ push:
 
 login:
 		@echo "Logging into DockerHub with provided credentials"
-		@docker login -u ${CCR_DOCKERU} -p ${CCR_DOCKERP}
\ No newline at end of file
+		@echo ${CCR_DOCKERP} | docker login -u ${CCR_DOCKERU} --password-stdin
\ No newline at end of file

From 523d4b1012ac9542b2bc7fb9a74b138354a15d12 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:33:03 +1100
Subject: [PATCH 12/40] edits

---
 chisholm-ray/actions02/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chisholm-ray/actions02/Makefile b/chisholm-ray/actions02/Makefile
index e7b13cd..5c34b70 100644
--- a/chisholm-ray/actions02/Makefile
+++ b/chisholm-ray/actions02/Makefile
@@ -13,4 +13,4 @@ push:
 
 login:
 		@echo "Logging into DockerHub with provided credentials"
-		@echo ${CCR_DOCKERP} | docker login -u ${CCR_DOCKERU} --password-stdin
\ No newline at end of file
+		@printf ${CCR_DOCKERP} | docker login -u ${CCR_DOCKERU} --password-stdin
\ No newline at end of file

From 05af44a11072e29b50e1e424f9a1e76ea4397116 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:37:48 +1100
Subject: [PATCH 13/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 80fdd28..1512996 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA=`git rev-parse HEAD | head -c 7`" >> $GITHUB_ENV
+        echo "SHORT_SHA=`${{ github.sha }} | head -c 7`" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From 5bda06ed0cf1b297afcddd74bb8d9bbc08d389dc Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 09:54:04 +1100
Subject: [PATCH 14/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 1512996..5ddba54 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -15,7 +15,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2  
-
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        
     - name: set variables
       run: |
         echo "SHORT_SHA=`${{ github.sha }} | head -c 7`" >> $GITHUB_ENV

From 5ca86efa9d1d09198ee6b8d21004e72ba4461413 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:20:51 +1100
Subject: [PATCH 15/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 5ddba54..83b11a6 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -17,10 +17,11 @@ jobs:
     - uses: actions/checkout@v2  
       with:
         ref: ${{ github.event.pull_request.head.sha }}
-        
+
     - name: set variables
-      run: |
-        echo "SHORT_SHA=`${{ github.sha }} | head -c 7`" >> $GITHUB_ENV
+    - run: |
+        echo "SHORT_SHA=`${{ github.sha }} | tail -c 7`" >> $GITHUB_ENV
+    - run: |
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From 816ec72c3715893f356df8dc0b072f346d5382f8 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:24:14 +1100
Subject: [PATCH 16/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 83b11a6..f214ace 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -15,8 +15,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2  
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
 
     - name: set variables
     - run: |

From deb63a78c5578a909a842556ccd05f3fe97ee3e9 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:25:14 +1100
Subject: [PATCH 17/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index f214ace..6932e3d 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -17,9 +17,9 @@ jobs:
     - uses: actions/checkout@v2  
 
     - name: set variables
-    - run: |
+      run: |
         echo "SHORT_SHA=`${{ github.sha }} | tail -c 7`" >> $GITHUB_ENV
-    - run: |
+      run: |
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From 8991824e78b291d4f3d8beb9d70755e2e8effb4b Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:25:56 +1100
Subject: [PATCH 18/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 6932e3d..b024e97 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -19,7 +19,6 @@ jobs:
     - name: set variables
       run: |
         echo "SHORT_SHA=`${{ github.sha }} | tail -c 7`" >> $GITHUB_ENV
-      run: |
         echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From b40fb6902e980379de3b4f8ae08ac38a1252839a Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:30:41 +1100
Subject: [PATCH 19/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index b024e97..9246aa9 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -19,7 +19,7 @@ jobs:
     - name: set variables
       run: |
         echo "SHORT_SHA=`${{ github.sha }} | tail -c 7`" >> $GITHUB_ENV
-        echo "IMAGEFULLNAME=conorcr/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
+        echo "IMAGEFULLNAME="conorcr/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
 
     - name: docker login 
       env:

From 1871815cd0a3e1dfd35bd98ea3da56eb656b147d Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:32:06 +1100
Subject: [PATCH 20/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 9246aa9..6083bd1 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA=`${{ github.sha }} | tail -c 7`" >> $GITHUB_ENV
+        echo "SHORT_SHA="`${{ github.sha }} | tail -c 7`"" >> $GITHUB_ENV
         echo "IMAGEFULLNAME="conorcr/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
 
     - name: docker login 

From 57cc8961d11f14b95ccd3385ecc7a58c9ddc2242 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:36:18 +1100
Subject: [PATCH 21/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 6083bd1..2c1fa97 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA="`${{ github.sha }} | tail -c 7`"" >> $GITHUB_ENV
+        echo "SHORT_SHA="${{ github.sha }} | head -c 7"" >> $GITHUB_ENV
         echo "IMAGEFULLNAME="conorcr/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
 
     - name: docker login 

From f7839ce89896a324cfa770c764a2e1dffb585d3a Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:55:43 +1100
Subject: [PATCH 22/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 2c1fa97..c606c59 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,8 +18,8 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA="${{ github.sha }} | head -c 7"" >> $GITHUB_ENV
-        echo "IMAGEFULLNAME="conorcr/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
+        echo "SHORT_SHA=$(${{ github.sha }} | head -c 7) >> $GITHUB_ENV
+        echo "IMAGEFULLNAME="${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
 
     - name: docker login 
       env:

From 6efc8b7d84b6f84e4ccd6c40a5cda60911b47923 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 10:56:37 +1100
Subject: [PATCH 23/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index c606c59..08fac7d 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA=$(${{ github.sha }} | head -c 7) >> $GITHUB_ENV
+        echo "SHORT_SHA=$(${{ github.sha }} | head -c 7)" >> $GITHUB_ENV
         echo "IMAGEFULLNAME="${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
 
     - name: docker login 

From 7742af3591df5c0af84c248690c16d4dbd985e1e Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:00:04 +1100
Subject: [PATCH 24/40] editds

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 08fac7d..c708c98 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -19,7 +19,8 @@ jobs:
     - name: set variables
       run: |
         echo "SHORT_SHA=$(${{ github.sha }} | head -c 7)" >> $GITHUB_ENV
-        echo "IMAGEFULLNAME="${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}"" >> $GITHUB_ENV
+        echo $SHORT_SHA
+        echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 
       env:

From bc05274836b39d8e86dfc91f2edc28beea78b7f7 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:07:01 +1100
Subject: [PATCH 25/40] edit

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index c708c98..cd061a3 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,8 +18,8 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA=$(${{ github.sha }} | head -c 7)" >> $GITHUB_ENV
-        echo $SHORT_SHA
+        ${{ github.sha }} | head -c 7 > short_sha
+        echo "SHORT_SHA=$(cat short_sha)" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From a17d89ad27ba4ee2484e983444d9954c6e104f10 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:10:15 +1100
Subject: [PATCH 26/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index cd061a3..39df154 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,7 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        ${{ github.sha }} | head -c 7 > short_sha
+        echo ${{ github.sha }} | head -c 7 > short_sha
         echo "SHORT_SHA=$(cat short_sha)" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 

From 89f7e582ed3cd4c44bb2c2b563bfa78747e6bb04 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:13:17 +1100
Subject: [PATCH 27/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 39df154..30c998b 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -19,7 +19,8 @@ jobs:
     - name: set variables
       run: |
         echo ${{ github.sha }} | head -c 7 > short_sha
-        echo "SHORT_SHA=$(cat short_sha)" >> $GITHUB_ENV
+        SHORT_SHA=`cat short_sha` 
+        echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From 7b0b44fef9b9aaff34639a3179b5e2402e04e411 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:17:20 +1100
Subject: [PATCH 28/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 30c998b..3fc9205 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,9 +18,8 @@ jobs:
 
     - name: set variables
       run: |
-        echo ${{ github.sha }} | head -c 7 > short_sha
-        SHORT_SHA=`cat short_sha` 
-        echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
+        echo $(${{ github.sha }} | head -c 7) > short_sha 
+        echo "SHORT_SHA=$(cat short_sha)" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From 760e09edd628442afee1ae9ff2a83486ea68e61c Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:22:47 +1100
Subject: [PATCH 29/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 3fc9205..23ce1f8 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,8 +18,7 @@ jobs:
 
     - name: set variables
       run: |
-        echo $(${{ github.sha }} | head -c 7) > short_sha 
-        echo "SHORT_SHA=$(cat short_sha)" >> $GITHUB_ENV
+        echo "SHORT_SHA=$(echo ${{ github.sha }} | head -c 7)" >> $GITHUB_ENV
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
 
     - name: docker login 

From c8d74664ed7a53b7f307a357be439433c9f8c61d Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:25:25 +1100
Subject: [PATCH 30/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 23ce1f8..c1f8330 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -18,8 +18,8 @@ jobs:
 
     - name: set variables
       run: |
-        echo "SHORT_SHA=$(echo ${{ github.sha }} | head -c 7)" >> $GITHUB_ENV
-        echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:${{ env.SHORT_SHA }}" >> $GITHUB_ENV
+        echo ${{ github.sha }} | head -c 7 > TAG_SHA 
+        echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
 
     - name: docker login 
       env:

From d1296b351de2c66eb69b122db614dfc2c8c479ff Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:26:47 +1100
Subject: [PATCH 31/40] edits

---
 chisholm-ray/actions02/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chisholm-ray/actions02/Makefile b/chisholm-ray/actions02/Makefile
index 5c34b70..b0a174c 100644
--- a/chisholm-ray/actions02/Makefile
+++ b/chisholm-ray/actions02/Makefile
@@ -5,7 +5,7 @@
 
 build:
 		@echo "Building image with tag ${IMAGEFULLNAME}"
-	    @docker build -t ${IMAGEFULLNAME} -f chisholm-ray/actions02/Dockerfile .
+	    @docker build -t ${IMAGEFULLNAME} -f ./Dockerfile .
 
 push:
 		@echo "Pushing image with tag ${IMAGEFULLNAME} to DockerHub"

From 8b4c823fd6b5b76d051dfaa1a41a2521f7f61a90 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:45:16 +1100
Subject: [PATCH 32/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 8 +++++++-
 chisholm-ray/actions02/Dockerfile                | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index c1f8330..254cdcc 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -21,6 +21,8 @@ jobs:
         echo ${{ github.sha }} | head -c 7 > TAG_SHA 
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
 
+        echo "::set-output name=IMAGEFULLNAME::${IMAGEFULLNAME}"
+
     - name: docker login 
       env:
         CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
@@ -34,8 +36,12 @@ jobs:
     - name: push image
       run: make push
 
+    - outputs:
+      IMAGEFULLNAME: ${{ steps.identify.outputs.IMAGEFULLNAME }}
+
   comment_pr:
     runs-on: ubuntu-latest
+    needs: build
     steps:
     - name: Checkout
       uses: actions/checkout@v1
@@ -44,6 +50,6 @@ jobs:
       uses: thollander/actions-comment-pull-request@v1
 
       with:
-        message: 'Image name ${{ env.IMAGEFULLNAME }} has been pushed to dockerhub'
+        message: 'Image name ${{ needs.build.outputs.IMAGEFULLNAME }} has been pushed to dockerhub'
         GITHUB_TOKEN: ${{ secrets.CCR_GITHUB_TOKEN}}
       
\ No newline at end of file
diff --git a/chisholm-ray/actions02/Dockerfile b/chisholm-ray/actions02/Dockerfile
index 4fa049a..85d31ab 100644
--- a/chisholm-ray/actions02/Dockerfile
+++ b/chisholm-ray/actions02/Dockerfile
@@ -1,2 +1,2 @@
   FROM httpd:2.4.51
-  RUN echo "This is my GH actions exercise" > /usr/local/apache2/htdocs/index.html
\ No newline at end of file
+  RUN echo "This is my GH actions exercise!" > /usr/local/apache2/htdocs/index.html
\ No newline at end of file

From 05db86ab141e0684d90c4aba131e27ae2d1cafa6 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:46:30 +1100
Subject: [PATCH 33/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 254cdcc..534c015 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -36,7 +36,7 @@ jobs:
     - name: push image
       run: make push
 
-    - outputs:
+    outputs:
       IMAGEFULLNAME: ${{ steps.identify.outputs.IMAGEFULLNAME }}
 
   comment_pr:

From 2b07e48d39a060dc8b1f89b48ee9329461595d36 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:53:01 +1100
Subject: [PATCH 34/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 534c015..d55d3e5 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -16,12 +16,12 @@ jobs:
     steps:
     - uses: actions/checkout@v2  
 
-    - name: set variables
+    - id: vars
       run: |
         echo ${{ github.sha }} | head -c 7 > TAG_SHA 
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
 
-        echo "::set-output name=IMAGEFULLNAME::${IMAGEFULLNAME}"
+        echo "::set-output name=tag::${{ env.IMAGEFULLNAME }}"
 
     - name: docker login 
       env:
@@ -37,7 +37,7 @@ jobs:
       run: make push
 
     outputs:
-      IMAGEFULLNAME: ${{ steps.identify.outputs.IMAGEFULLNAME }}
+      dockertag: ${{ steps.vars.outputs.tag }}
 
   comment_pr:
     runs-on: ubuntu-latest
@@ -50,6 +50,6 @@ jobs:
       uses: thollander/actions-comment-pull-request@v1
 
       with:
-        message: 'Image name ${{ needs.build.outputs.IMAGEFULLNAME }} has been pushed to dockerhub'
+        message: 'Image name ${{ needs.build.outputs.dockertag }} has been pushed to dockerhub'
         GITHUB_TOKEN: ${{ secrets.CCR_GITHUB_TOKEN}}
       
\ No newline at end of file

From fe9f78d5d59e816fc588ecf60ae2a9565b720e52 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 11:56:22 +1100
Subject: [PATCH 35/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index d55d3e5..74b3da9 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -21,7 +21,7 @@ jobs:
         echo ${{ github.sha }} | head -c 7 > TAG_SHA 
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
 
-        echo "::set-output name=tag::${{ env.IMAGEFULLNAME }}"
+        echo "::set-output name=tag::${IMAGEFULLNAME}"
 
     - name: docker login 
       env:

From 0f25a4f3083c455b732b08201188a2e08ac71fb9 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 12:01:48 +1100
Subject: [PATCH 36/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 74b3da9..0f2b630 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -16,7 +16,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2  
 
-    - id: vars
+    - name: set variables
+      id: vars
       run: |
         echo ${{ github.sha }} | head -c 7 > TAG_SHA 
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV

From e160a10300b2582a39035ae717b0fb1b79dac166 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 12:08:45 +1100
Subject: [PATCH 37/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 0f2b630..1d189d0 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -17,13 +17,10 @@ jobs:
     - uses: actions/checkout@v2  
 
     - name: set variables
-      id: vars
       run: |
         echo ${{ github.sha }} | head -c 7 > TAG_SHA 
         echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
 
-        echo "::set-output name=tag::${IMAGEFULLNAME}"
-
     - name: docker login 
       env:
         CCR_DOCKERU: ${{ secrets.CCR_DOCKERU }}
@@ -37,8 +34,11 @@ jobs:
     - name: push image
       run: make push
 
+    - name: set outputs
+      id: outs
+      run: echo "::set-output name=tag::$(${IMAGEFULLNAME})"
     outputs:
-      dockertag: ${{ steps.vars.outputs.tag }}
+      dockertag: ${{ steps.outs.outputs.tag }}
 
   comment_pr:
     runs-on: ubuntu-latest

From a40742e585409b83cee53e737e9d43d1a763459a Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 12:27:39 +1100
Subject: [PATCH 38/40] edits

---
 .github/workflows/chisholm-ray_c05-actions02.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index 1d189d0..e2858ec 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -46,11 +46,14 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v1
-
+    - name: set variables 
+      run: |
+        echo ${{ github.sha }} | head -c 7 > TAG_SHA 
+        echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
     - name: Comment PR
       uses: thollander/actions-comment-pull-request@v1
 
       with:
-        message: 'Image name ${{ needs.build.outputs.dockertag }} has been pushed to dockerhub'
+        message: 'Image name ${IMAGEFULLNAME} has been pushed to dockerhub'
         GITHUB_TOKEN: ${{ secrets.CCR_GITHUB_TOKEN}}
       
\ No newline at end of file

From e7261efbad7daee9b77d150a29d4a4a4631b5d78 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 12:31:41 +1100
Subject: [PATCH 39/40] edits

---
 .../workflows/chisholm-ray_c05-actions02.yml   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.github/workflows/chisholm-ray_c05-actions02.yml b/.github/workflows/chisholm-ray_c05-actions02.yml
index e2858ec..22d97dd 100644
--- a/.github/workflows/chisholm-ray_c05-actions02.yml
+++ b/.github/workflows/chisholm-ray_c05-actions02.yml
@@ -34,26 +34,10 @@ jobs:
     - name: push image
       run: make push
 
-    - name: set outputs
-      id: outs
-      run: echo "::set-output name=tag::$(${IMAGEFULLNAME})"
-    outputs:
-      dockertag: ${{ steps.outs.outputs.tag }}
-
-  comment_pr:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v1
-    - name: set variables 
-      run: |
-        echo ${{ github.sha }} | head -c 7 > TAG_SHA 
-        echo "IMAGEFULLNAME=${{ secrets.CCR_DOCKERU }}/actions02:$(cat TAG_SHA)" >> $GITHUB_ENV
     - name: Comment PR
       uses: thollander/actions-comment-pull-request@v1
 
       with:
-        message: 'Image name ${IMAGEFULLNAME} has been pushed to dockerhub'
+        message: 'Image name ${{ env.IMAGEFULLNAME}} has been pushed to dockerhub'
         GITHUB_TOKEN: ${{ secrets.CCR_GITHUB_TOKEN}}
       
\ No newline at end of file

From 1465a756f6f1531e145d313d921b6533131eee43 Mon Sep 17 00:00:00 2001
From: Conor Chisholm-Ray <chisholm-ray@hotmail.com>
Date: Wed, 16 Feb 2022 12:38:13 +1100
Subject: [PATCH 40/40] edit dockerfile

---
 chisholm-ray/actions02/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chisholm-ray/actions02/Dockerfile b/chisholm-ray/actions02/Dockerfile
index 85d31ab..924d736 100644
--- a/chisholm-ray/actions02/Dockerfile
+++ b/chisholm-ray/actions02/Dockerfile
@@ -1,2 +1,2 @@
   FROM httpd:2.4.51
-  RUN echo "This is my GH actions exercise!" > /usr/local/apache2/htdocs/index.html
\ No newline at end of file
+  RUN echo "This is my GH actions exercise v2" > /usr/local/apache2/htdocs/index.html
\ No newline at end of file