From 3878c978a201b0a2de5c174caaa290070149e6a7 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:33:02 +1100 Subject: [PATCH 01/36] initial commit --- .../beardedsamwise-c05-actions02.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/beardedsamwise-c05-actions02.yaml diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml new file mode 100644 index 0000000..f8865a4 --- /dev/null +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -0,0 +1,20 @@ +on: + pull_request: + paths: + - 'beardedsamwise/c05-actions-02/*' + +jobs: + build: + runs-on: ubuntu-latest + name: Push image to Docker Hub + steps: + - name: Checkout repo + uses: actions/checkout@v2 + with: + fetch-depth: 1 + + - name: Build and push image to Docker Hub + run: make all + env: + BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} + From 463e200c9186a706056958c2195e51294a5116f8 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:35:25 +1100 Subject: [PATCH 02/36] initial commit --- beardedsamwise/c05-actions-02/Dockerfile | 2 ++ beardedsamwise/c05-actions-02/Makefile | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 beardedsamwise/c05-actions-02/Dockerfile create mode 100644 beardedsamwise/c05-actions-02/Makefile diff --git a/beardedsamwise/c05-actions-02/Dockerfile b/beardedsamwise/c05-actions-02/Dockerfile new file mode 100644 index 0000000..982e43a --- /dev/null +++ b/beardedsamwise/c05-actions-02/Dockerfile @@ -0,0 +1,2 @@ +FROM httpd:2.4.41 +RUN echo "This is my GH actions exercise" > /usr/local/apache2/htdocs/index.html \ No newline at end of file diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile new file mode 100644 index 0000000..cc41e83 --- /dev/null +++ b/beardedsamwise/c05-actions-02/Makefile @@ -0,0 +1,23 @@ +SHA = $(shell git rev-parse --short HEAD) +IMAGEID = "beardedsamwise/c05-actions02" + +.PHONY: build +build: + @echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" + @docker build -t $(IMAGEID):$(SHA) . + +.PHONY: push +push: + @echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" + @docker push $(IMAGEID):$(SHA) + +.PHONY: login +login: + @echo "LOGGING IN TO DOCKER HUB..." + @docker login -u beardedsamwise -p $(BEARDED_DOCKER) + +.PHONY: all +all: login build push + +.PHONE: test +test: build push From 7a68f07406c6f9252f0184b6007da550887e5f7d Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:37:37 +1100 Subject: [PATCH 03/36] update makefile --- beardedsamwise/c05-actions02/Makefile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 beardedsamwise/c05-actions02/Makefile diff --git a/beardedsamwise/c05-actions02/Makefile b/beardedsamwise/c05-actions02/Makefile new file mode 100644 index 0000000..6e26d51 --- /dev/null +++ b/beardedsamwise/c05-actions02/Makefile @@ -0,0 +1,25 @@ +SHA = $(shell git rev-parse --short HEAD) +IMAGEID = "beardedsamwise/c05-actions02" + +.PHONY: build +build: + @echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" + @docker build -t $(IMAGEID):$(SHA) . + +.PHONY: push +push: + @echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" + @docker push $(IMAGEID):$(SHA) + +.PHONY: login +login: + @echo "LOGGING IN TO DOCKER HUB..." + @docker login -u beardedsamwise -p $(BEARDED_DOCKER) + +.PHONY: all +all: + login build push + +.PHONE: test +test: + build push From cf887a46d393c47a7d56ffd882cc74715482e655 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:42:12 +1100 Subject: [PATCH 04/36] update makefile --- beardedsamwise/c05-actions-02/Makefile | 8 ++++---- beardedsamwise/c05-actions02/Makefile | 25 ------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 beardedsamwise/c05-actions02/Makefile diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index cc41e83..57da865 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -16,8 +16,8 @@ login: @echo "LOGGING IN TO DOCKER HUB..." @docker login -u beardedsamwise -p $(BEARDED_DOCKER) -.PHONY: all -all: login build push +all: + login build push -.PHONE: test -test: build push +test: + build push diff --git a/beardedsamwise/c05-actions02/Makefile b/beardedsamwise/c05-actions02/Makefile deleted file mode 100644 index 6e26d51..0000000 --- a/beardedsamwise/c05-actions02/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -SHA = $(shell git rev-parse --short HEAD) -IMAGEID = "beardedsamwise/c05-actions02" - -.PHONY: build -build: - @echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" - @docker build -t $(IMAGEID):$(SHA) . - -.PHONY: push -push: - @echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" - @docker push $(IMAGEID):$(SHA) - -.PHONY: login -login: - @echo "LOGGING IN TO DOCKER HUB..." - @docker login -u beardedsamwise -p $(BEARDED_DOCKER) - -.PHONY: all -all: - login build push - -.PHONE: test -test: - build push From 38480bd0cd7275fc98a575b72340a555ba0383fd Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:43:57 +1100 Subject: [PATCH 05/36] add working directory --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index f8865a4..01da719 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -14,6 +14,7 @@ jobs: fetch-depth: 1 - name: Build and push image to Docker Hub + working-directory: beardedsamwise/c05-actions-02/ run: make all env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} From 66c3d38b8d5fa5b0c6a67453411482405fa3bc84 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Mon, 14 Feb 2022 16:45:24 +1100 Subject: [PATCH 06/36] add sudo to login --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 57da865..6d9eb57 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -14,7 +14,7 @@ push: .PHONY: login login: @echo "LOGGING IN TO DOCKER HUB..." - @docker login -u beardedsamwise -p $(BEARDED_DOCKER) + @sudo docker login -u beardedsamwise -p $(BEARDED_DOCKER) all: login build push From 199000828bad7688b160aa475f090514eeac805d Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:17:09 +1100 Subject: [PATCH 07/36] export BEARDED_DOCKER --- beardedsamwise/c05-actions-02/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 6d9eb57..b115e8c 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,20 +1,21 @@ SHA = $(shell git rev-parse --short HEAD) IMAGEID = "beardedsamwise/c05-actions02" +export BEARDED_DOCKER .PHONY: build build: - @echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" - @docker build -t $(IMAGEID):$(SHA) . + echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" + docker build -t $(IMAGEID):$(SHA) . .PHONY: push push: - @echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" - @docker push $(IMAGEID):$(SHA) + echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" + docker push $(IMAGEID):$(SHA) .PHONY: login login: - @echo "LOGGING IN TO DOCKER HUB..." - @sudo docker login -u beardedsamwise -p $(BEARDED_DOCKER) + echo "LOGGING IN TO DOCKER HUB..." + docker login -u beardedsamwise -p $(BEARDED_DOCKER) all: login build push From 1e1a7ace3364b6a93ccb1d42fddb864174169c21 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:21:22 +1100 Subject: [PATCH 08/36] add sudo to login --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index b115e8c..3a8e48c 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -15,7 +15,7 @@ push: .PHONY: login login: echo "LOGGING IN TO DOCKER HUB..." - docker login -u beardedsamwise -p $(BEARDED_DOCKER) + sudo docker login -u beardedsamwise -p $(BEARDED_DOCKER) all: login build push From 1a1391907700c54430768e3341b66b340d6e06eb Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:28:46 +1100 Subject: [PATCH 09/36] change sudo --- beardedsamwise/c05-actions-02/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 3a8e48c..616d168 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -15,7 +15,8 @@ push: .PHONY: login login: echo "LOGGING IN TO DOCKER HUB..." - sudo docker login -u beardedsamwise -p $(BEARDED_DOCKER) + sudo su + echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin all: login build push From dd50af88da4b9fda22eb4db57d2da6e04e5bf56f Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:30:31 +1100 Subject: [PATCH 10/36] update actions --- .github/workflows/beardedsamwise-c05-actions02.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 01da719..dd758b3 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -13,9 +13,9 @@ jobs: with: fetch-depth: 1 - - name: Build and push image to Docker Hub + - name: Log in to Docker Hub working-directory: beardedsamwise/c05-actions-02/ - run: make all + run: make login env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} From e160b69fde4e369edf6e4a5e0ac423337c29e81b Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:33:02 +1100 Subject: [PATCH 11/36] update Makefile --- beardedsamwise/c05-actions-02/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 616d168..cc9327f 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -15,7 +15,6 @@ push: .PHONY: login login: echo "LOGGING IN TO DOCKER HUB..." - sudo su echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin all: From 75851a04a21e91571a29e0b3b74faa05b1bfc366 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:35:04 +1100 Subject: [PATCH 12/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index dd758b3..e4c8af2 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -19,3 +19,13 @@ jobs: env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} + - name: Build Docker image + working-directory: beardedsamwise/c05-actions-02/ + run: make build + + - name: Log in to Docker Hub + working-directory: beardedsamwise/c05-actions-02/ + run: make push + + + From a3e6b7a652b33761d3cbd72b040455c8ac04e66c Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:36:58 +1100 Subject: [PATCH 13/36] update makefile --- beardedsamwise/c05-actions-02/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index cc9327f..386064c 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -4,18 +4,18 @@ export BEARDED_DOCKER .PHONY: build build: - echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" + @echo "BUILDING DOCKER IMAGE WITH TAG $(IMAGEID):$(SHA)" docker build -t $(IMAGEID):$(SHA) . .PHONY: push push: - echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" + @echo "PUSHING DOCKER IMAGE TO DOCKER HUB WITH TAG c03-make01:$(SHA)" docker push $(IMAGEID):$(SHA) .PHONY: login login: echo "LOGGING IN TO DOCKER HUB..." - echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin + @echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin all: login build push From 36e8e41036122b57859f3a16ba8a7a896061e913 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:37:20 +1100 Subject: [PATCH 14/36] fix step names --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index e4c8af2..b1da2ef 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -23,7 +23,7 @@ jobs: working-directory: beardedsamwise/c05-actions-02/ run: make build - - name: Log in to Docker Hub + - name: Push image to Docker Hub working-directory: beardedsamwise/c05-actions-02/ run: make push From 980e7a6bb1a84d764ec8a6747c6dae177893d11b Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:50:43 +1100 Subject: [PATCH 15/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index b1da2ef..3e5c44f 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -10,6 +10,7 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v2 + ref: ${{ GITHUB_SHA }} with: fetch-depth: 1 From 051724ee1ea547b0e60f753ccb768351ae737ede Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:52:00 +1100 Subject: [PATCH 16/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 3e5c44f..cb0a58c 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -13,6 +13,7 @@ jobs: ref: ${{ GITHUB_SHA }} with: fetch-depth: 1 + ref: ${{ GITHUB_SHA }} - name: Log in to Docker Hub working-directory: beardedsamwise/c05-actions-02/ From 83e54649c08284017c1c0705acc23c566a02a6a4 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:52:43 +1100 Subject: [PATCH 17/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index cb0a58c..c3466cc 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -10,7 +10,6 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v2 - ref: ${{ GITHUB_SHA }} with: fetch-depth: 1 ref: ${{ GITHUB_SHA }} From 816eb8e87b030a273f6a7f207ef0e0bfd2da6351 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:53:31 +1100 Subject: [PATCH 18/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index c3466cc..b72af47 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ GITHUB_SHA }} + ref: ${{ github.GITHUB_SHA }} - name: Log in to Docker Hub working-directory: beardedsamwise/c05-actions-02/ From d613db6f8c8ba82b9286b6c63d7a69e00fe99183 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 10:59:24 +1100 Subject: [PATCH 19/36] update make --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 386064c..d52a3f2 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,4 +1,4 @@ -SHA = $(shell git rev-parse --short HEAD) +export GITHUB_SHA IMAGEID = "beardedsamwise/c05-actions02" export BEARDED_DOCKER From f9338ab0d10934205c13b33afaa271d77640ce5f Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:01:46 +1100 Subject: [PATCH 20/36] update make --- .github/workflows/beardedsamwise-c05-actions02.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index b72af47..853ae3d 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -12,14 +12,13 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 - ref: ${{ github.GITHUB_SHA }} - name: Log in to Docker Hub working-directory: beardedsamwise/c05-actions-02/ run: make login env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - + SHA: ${{ github.GITHUB_SHA }} - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From 4d07794acccafb752ece05d5b4b9bae69c10c074 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:02:47 +1100 Subject: [PATCH 21/36] update make --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index d52a3f2..bb9c599 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,4 +1,4 @@ -export GITHUB_SHA +export SHA IMAGEID = "beardedsamwise/c05-actions02" export BEARDED_DOCKER From a57698366f417ede7d31c0a95de9b7ce2801fbcb Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:04:26 +1100 Subject: [PATCH 22/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 853ae3d..ad673be 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -22,10 +22,14 @@ jobs: - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build + env: + SHA: ${{ github.GITHUB_SHA }} - name: Push image to Docker Hub working-directory: beardedsamwise/c05-actions-02/ run: make push + env: + SHA: ${{ github.GITHUB_SHA }} From 0c0715c45c1a91006eb67669987c7d58e69c64a3 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:10:18 +1100 Subject: [PATCH 23/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index ad673be..7deeabf 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -18,18 +18,13 @@ jobs: run: make login env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - SHA: ${{ github.GITHUB_SHA }} - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build - env: - SHA: ${{ github.GITHUB_SHA }} - name: Push image to Docker Hub working-directory: beardedsamwise/c05-actions-02/ run: make push - env: - SHA: ${{ github.GITHUB_SHA }} From eaa007ca40cc0b32cfb480c93c0e9d5787d7d845 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:10:37 +1100 Subject: [PATCH 24/36] update make --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index bb9c599..386064c 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,4 +1,4 @@ -export SHA +SHA = $(shell git rev-parse --short HEAD) IMAGEID = "beardedsamwise/c05-actions02" export BEARDED_DOCKER From 087d67abe417b75c49e744d17dc757cb10ea464c Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:31:11 +1100 Subject: [PATCH 25/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 7deeabf..73b7739 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -18,6 +18,9 @@ jobs: run: make login env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} + - name: Show Docker logs + working-directory: beardedsamwise/c05-actions-02/ + run: git log --pretty=format:"%h - %an, %ar : %s" - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From e701fbfcb7e2748bb2e74160879e1293166244c3 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:32:23 +1100 Subject: [PATCH 26/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 73b7739..55246f0 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -20,7 +20,7 @@ jobs: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - name: Show Docker logs working-directory: beardedsamwise/c05-actions-02/ - run: git log --pretty=format:"%h - %an, %ar : %s" + run: git log --pretty=format:%h - %an, %ar - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From 6f0f0b40243e800eb6fd0984822e0f76d3afb903 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:33:18 +1100 Subject: [PATCH 27/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 55246f0..78656b2 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -20,7 +20,7 @@ jobs: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - name: Show Docker logs working-directory: beardedsamwise/c05-actions-02/ - run: git log --pretty=format:%h - %an, %ar + run: git log --pretty=format:"%h - %an, %ar" - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From 758bb3d514eb6f6a44bd45b16c526f22b1f70cd1 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:48:42 +1100 Subject: [PATCH 28/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 78656b2..bb36bcd 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -20,7 +20,9 @@ jobs: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - name: Show Docker logs working-directory: beardedsamwise/c05-actions-02/ - run: git log --pretty=format:"%h - %an, %ar" + run: echo $GITHUB_SHA + env: + GIT_SHA: ${{ GITHUB_SHA }} - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From c4a650b8e5bc9e8c66aaf0d76129cb8512d9323c Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:49:09 +1100 Subject: [PATCH 29/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index bb36bcd..0dd0227 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -22,7 +22,7 @@ jobs: working-directory: beardedsamwise/c05-actions-02/ run: echo $GITHUB_SHA env: - GIT_SHA: ${{ GITHUB_SHA }} + GIT_SHA: ${{ github.GITHUB_SHA }} - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build From 45ef17c7b114b196b2f5e1239b4a99fba32b33e4 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 11:59:12 +1100 Subject: [PATCH 30/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 0dd0227..5d7decd 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -12,6 +12,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 1 + ref: ${{ github.event.pull_request.head.sha }} - name: Log in to Docker Hub working-directory: beardedsamwise/c05-actions-02/ From 5a7b0a0053be3f51c7a2f35f81b555e6f0d1ab85 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 13:03:34 +1100 Subject: [PATCH 31/36] update make --- beardedsamwise/c05-actions-02/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 386064c..c4a7bc9 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,6 +1,7 @@ SHA = $(shell git rev-parse --short HEAD) IMAGEID = "beardedsamwise/c05-actions02" export BEARDED_DOCKER +export GITHUB_ENV .PHONY: build build: @@ -16,6 +17,9 @@ push: login: echo "LOGGING IN TO DOCKER HUB..." @echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin +.PHONY: output +output: + echo "FULLIMAGEID=$(IMAGEID):$(SHA)" >> $(GITHUB_ENV) all: login build push From 5ac5a1d1349f7d63c8cba88cdee6b92440d9bfc3 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 13:03:46 +1100 Subject: [PATCH 32/36] update workflow --- .../workflows/beardedsamwise-c05-actions02.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index 5d7decd..d33ae11 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -5,6 +5,8 @@ on: jobs: build: + outputs: + output1: ${{ steps.step5.outputs.test }} runs-on: ubuntu-latest name: Push image to Docker Hub steps: @@ -19,11 +21,7 @@ jobs: run: make login env: BEARDED_DOCKER: ${{ secrets.BEARDED_DOCKER }} - - name: Show Docker logs - working-directory: beardedsamwise/c05-actions-02/ - run: echo $GITHUB_SHA - env: - GIT_SHA: ${{ github.GITHUB_SHA }} + - name: Build Docker image working-directory: beardedsamwise/c05-actions-02/ run: make build @@ -32,5 +30,12 @@ jobs: working-directory: beardedsamwise/c05-actions-02/ run: make push + - name: Create Image ID Variable + working-directory: beardedsamwise/c05-actions-02/ + run: make output + + - name: Test output + run: echo "${{ env.FULLIMAGEID }}" + From 16859e5c14b29987deed4ee3b063ce6a954e59bb Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 13:07:13 +1100 Subject: [PATCH 33/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index d33ae11..b7ce85b 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -30,12 +30,17 @@ jobs: working-directory: beardedsamwise/c05-actions-02/ run: make push - - name: Create Image ID Variable + - name: Create image ID variable working-directory: beardedsamwise/c05-actions-02/ run: make output - - name: Test output - run: echo "${{ env.FULLIMAGEID }}" + - name: Comment PR with latest image ID + uses: thollander/actions-comment-pull-request@v1 + + with: + message: 'The latest Docker image ID is: ${{ env.FULLIMAGEID }}' + GITHUB_TOKEN: ${{ secrets.BEARDED_KEY }} + From 86128822c0da95ad8418a9ec7726932b2a66a36a Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 13:10:00 +1100 Subject: [PATCH 34/36] update workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index b7ce85b..b64165d 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -36,7 +36,6 @@ jobs: - name: Comment PR with latest image ID uses: thollander/actions-comment-pull-request@v1 - with: message: 'The latest Docker image ID is: ${{ env.FULLIMAGEID }}' GITHUB_TOKEN: ${{ secrets.BEARDED_KEY }} From 413f881c6c3de643253b5e4810e5960b509c3d4d Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 13:14:37 +1100 Subject: [PATCH 35/36] update makefile --- beardedsamwise/c05-actions-02/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index c4a7bc9..38b0dec 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -1,7 +1,6 @@ SHA = $(shell git rev-parse --short HEAD) IMAGEID = "beardedsamwise/c05-actions02" export BEARDED_DOCKER -export GITHUB_ENV .PHONY: build build: @@ -17,6 +16,7 @@ push: login: echo "LOGGING IN TO DOCKER HUB..." @echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin + .PHONY: output output: echo "FULLIMAGEID=$(IMAGEID):$(SHA)" >> $(GITHUB_ENV) From f5eaf93d89f2632e04940f729b303edaac0cb411 Mon Sep 17 00:00:00 2001 From: Sam Bentley Date: Tue, 15 Feb 2022 14:38:36 +1100 Subject: [PATCH 36/36] update make and workflow --- .github/workflows/beardedsamwise-c05-actions02.yaml | 2 -- beardedsamwise/c05-actions-02/Makefile | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/beardedsamwise-c05-actions02.yaml b/.github/workflows/beardedsamwise-c05-actions02.yaml index b64165d..22fcf2f 100644 --- a/.github/workflows/beardedsamwise-c05-actions02.yaml +++ b/.github/workflows/beardedsamwise-c05-actions02.yaml @@ -5,8 +5,6 @@ on: jobs: build: - outputs: - output1: ${{ steps.step5.outputs.test }} runs-on: ubuntu-latest name: Push image to Docker Hub steps: diff --git a/beardedsamwise/c05-actions-02/Makefile b/beardedsamwise/c05-actions-02/Makefile index 38b0dec..25664a3 100644 --- a/beardedsamwise/c05-actions-02/Makefile +++ b/beardedsamwise/c05-actions-02/Makefile @@ -16,13 +16,8 @@ push: login: echo "LOGGING IN TO DOCKER HUB..." @echo $(BEARDED_DOCKER) | docker login --username beardedsamwise --password-stdin - + .PHONY: output output: echo "FULLIMAGEID=$(IMAGEID):$(SHA)" >> $(GITHUB_ENV) -all: - login build push - -test: - build push