From 4ac04a30f37b82ac3bab163bc8525b037e336a1e Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 28 Mar 2021 08:38:34 +0100 Subject: [PATCH 1/5] Bumping version to 2.0.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6a0ca2d..e8f41f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.7 \ No newline at end of file +2.0.8 \ No newline at end of file From c0ff399e9885f189e6af4167a6cf5817fbbb09a3 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 28 Mar 2021 08:38:43 +0100 Subject: [PATCH 2/5] Run publish workflow on release --- .github/workflows/main-7_3.yml | 14 +++----------- .github/workflows/main-7_4.yml | 14 +++----------- .github/workflows/main-8_0.yml | 14 +++----------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/main-7_3.yml b/.github/workflows/main-7_3.yml index ae7f6ad..e25157d 100644 --- a/.github/workflows/main-7_3.yml +++ b/.github/workflows/main-7_3.yml @@ -1,16 +1,8 @@ -name: main-7_3 +name: publish-7_3 on: - push: - branches: - - 'main' - tags-ignore: - - '**' - paths: - - '.github/workflows/main-7_3.yml' - - '7.3/**' - - 'overlay/**' - - 'VERSION' + release: + types: [published] jobs: publish-7_3: diff --git a/.github/workflows/main-7_4.yml b/.github/workflows/main-7_4.yml index 6a6caff..aef37c3 100644 --- a/.github/workflows/main-7_4.yml +++ b/.github/workflows/main-7_4.yml @@ -1,16 +1,8 @@ -name: main-7_4 +name: publish-7_4 on: - push: - branches: - - 'main' - tags-ignore: - - '**' - paths: - - '.github/workflows/main-7_4.yml' - - '7.4/**' - - 'overlay/**' - - 'VERSION' + release: + types: [published] jobs: publish-7_4: diff --git a/.github/workflows/main-8_0.yml b/.github/workflows/main-8_0.yml index a9008e1..43c9403 100644 --- a/.github/workflows/main-8_0.yml +++ b/.github/workflows/main-8_0.yml @@ -1,16 +1,8 @@ -name: main-8_0 +name: publish-8_0 on: - push: - branches: - - 'main' - tags-ignore: - - '**' - paths: - - '.github/workflows/main-8_0.yml' - - '8.0/**' - - 'overlay/**' - - 'VERSION' + release: + types: [published] jobs: publish-8_0: From bf6ab95cbc166c2c18b4a592a654dba972ff82f0 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 28 Mar 2021 08:39:01 +0100 Subject: [PATCH 3/5] Renaming main workflow to publish --- .github/workflows/{main-7_3.yml => publish-7_3.yml} | 0 .github/workflows/{main-7_4.yml => publish-7_4.yml} | 0 .github/workflows/{main-8_0.yml => publish-8_0.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{main-7_3.yml => publish-7_3.yml} (100%) rename .github/workflows/{main-7_4.yml => publish-7_4.yml} (100%) rename .github/workflows/{main-8_0.yml => publish-8_0.yml} (100%) diff --git a/.github/workflows/main-7_3.yml b/.github/workflows/publish-7_3.yml similarity index 100% rename from .github/workflows/main-7_3.yml rename to .github/workflows/publish-7_3.yml diff --git a/.github/workflows/main-7_4.yml b/.github/workflows/publish-7_4.yml similarity index 100% rename from .github/workflows/main-7_4.yml rename to .github/workflows/publish-7_4.yml diff --git a/.github/workflows/main-8_0.yml b/.github/workflows/publish-8_0.yml similarity index 100% rename from .github/workflows/main-8_0.yml rename to .github/workflows/publish-8_0.yml From dbc119d4d7990821974da1c3dfda0fbe5f252220 Mon Sep 17 00:00:00 2001 From: Ben Green Date: Sun, 28 Mar 2021 08:51:52 +0100 Subject: [PATCH 4/5] Run dev action on any push --- .github/workflows/dev-7_3.yml | 5 ----- .github/workflows/dev-7_4.yml | 5 ----- .github/workflows/dev-8_0.yml | 5 ----- 3 files changed, 15 deletions(-) diff --git a/.github/workflows/dev-7_3.yml b/.github/workflows/dev-7_3.yml index bb35f4f..4761d0b 100644 --- a/.github/workflows/dev-7_3.yml +++ b/.github/workflows/dev-7_3.yml @@ -6,11 +6,6 @@ on: - 'main' tags-ignore: - '**' - paths: - - '.github/workflows/dev-7_3.yml' - - '7.3/**' - - 'overlay/**' - - 'VERSION' jobs: test-7_3: diff --git a/.github/workflows/dev-7_4.yml b/.github/workflows/dev-7_4.yml index 2dfd14f..e415d56 100644 --- a/.github/workflows/dev-7_4.yml +++ b/.github/workflows/dev-7_4.yml @@ -6,11 +6,6 @@ on: - 'main' tags-ignore: - '**' - paths: - - '.github/workflows/dev-7_4.yml' - - '7.4/**' - - 'overlay/**' - - 'VERSION' jobs: test-7_4: diff --git a/.github/workflows/dev-8_0.yml b/.github/workflows/dev-8_0.yml index d0a0abf..0b3aa78 100644 --- a/.github/workflows/dev-8_0.yml +++ b/.github/workflows/dev-8_0.yml @@ -6,11 +6,6 @@ on: - 'main' tags-ignore: - '**' - paths: - - '.github/workflows/dev-8_0.yml' - - '8.0/**' - - 'overlay/**' - - 'VERSION' jobs: test-8_0: From 95b833695385a71aa3e435c7fdcb8a72eebd53ab Mon Sep 17 00:00:00 2001 From: Ben Green Date: Wed, 31 Mar 2021 10:40:17 +0100 Subject: [PATCH 5/5] Using latest base images --- 7.3/Dockerfile | 2 +- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/7.3/Dockerfile b/7.3/Dockerfile index 6878d78..2ba67de 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine3.12-2.0.8 +FROM bcgdesign/nginx:alpine3.12-2.0.9 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 50428a5..06f1cb6 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine3.13-2.0.8 +FROM bcgdesign/nginx:alpine3.13-2.0.9 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 3589546..a07e383 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM bcgdesign/nginx:alpine3.13-2.0.8 +FROM bcgdesign/nginx:alpine3.13-2.0.9 LABEL maintainer="Ben Green " \ org.label-schema.name="Nginx + PHP" \