From f803588b2856efc8c0a8ec27e9f87110ab520ba5 Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:29:31 +0100 Subject: [PATCH 1/7] Ensure docker image pushed to Docker Hub before README.md --- .github/workflows/docker-push-readme.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-push-readme.yml b/.github/workflows/docker-push-readme.yml index 55de291..d63850f 100644 --- a/.github/workflows/docker-push-readme.yml +++ b/.github/workflows/docker-push-readme.yml @@ -1,9 +1,13 @@ name: Push README to Docker Hub on: - push: - branches: - - main + workflow_run: + workflows: "Build and Push Docker Image" + types: + - completed + push: + branches: + - main jobs: PushContainerReadme: @@ -21,4 +25,4 @@ jobs: destination_container_repo: ${{ secrets.DOCKERHUB_USERNAME }}/template-repo-template provider: dockerhub short_description: 'Hello world sample application for Python template GitHub repository.' - readme_file: 'README.md' \ No newline at end of file + readme_file: 'README.md' From c36d82c8a70a1f8eb7b165b454795f2fa8996849 Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:32:15 +0100 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 854bb5a..f4a563f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.6.1] - 2023-10-15 + +- [ADDED] Ensured docker image pushed to Docker Hub before README.md + ## [1.6.0] - 2023-09-13 - [ADDED] GitHub Action Linting to Super-Linter workflow From f48cc7257488c75e624f7e098435adca77a9191e Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:37:55 +0100 Subject: [PATCH 3/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 29e50f8..971a146 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Use a base Python image FROM python:3.11 -LABEL maintainer=“tom_halpin@hotmail.com” +LABEL maintainer=“tom_halpin@hotmail.com,eoinhalpin99@gmail.com” LABEL description="Hello world sample application for Python template GitHub repository." # Set the working directory inside the container From 3bebb79bb8f02229bf877235f445d9db81ef93ec Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:40:52 +0100 Subject: [PATCH 4/7] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5b2dfa8..fe4eb75 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Codeowners file # syntax: https://help.github.com/en/articles/about-code-owners -* @tom-halpin +* @tom-halpin eoinhalpin99@gmail.com From b24bc3a0500583eaf48732e5ea7edfa7a432030c Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:41:41 +0100 Subject: [PATCH 5/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4a563f..9d15aab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.6.1] - 2023-10-15 - [ADDED] Ensured docker image pushed to Docker Hub before README.md +- [CHANGED] Codeowners and Dockerfile maintainers ## [1.6.0] - 2023-09-13 From 3361ccb71ddbb600fa8d530e5e014d906e9cdc12 Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:43:17 +0100 Subject: [PATCH 6/7] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fe4eb75..924e8aa 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Codeowners file # syntax: https://help.github.com/en/articles/about-code-owners -* @tom-halpin eoinhalpin99@gmail.com +* @tom-halpin eoinhalpin99 From 9744fadd69dee31d2f6e7489f0ef5bec8eb7d0d1 Mon Sep 17 00:00:00 2001 From: Eoin Halpin <90607697+eoinhalpin99@users.noreply.github.com> Date: Sun, 15 Oct 2023 11:43:37 +0100 Subject: [PATCH 7/7] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 924e8aa..fa6b1cf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Codeowners file # syntax: https://help.github.com/en/articles/about-code-owners -* @tom-halpin eoinhalpin99 +* @tom-halpin @eoinhalpin99