From a50ce69fc02b08e54a43b05e631835341de2024f Mon Sep 17 00:00:00 2001 From: xZero707 Date: Thu, 6 Apr 2023 21:32:28 +0200 Subject: [PATCH] Reformat and cleanup --- build/docker-bake.hcl | 117 +++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 63 deletions(-) diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl index c5bbacf..d9da89c 100644 --- a/build/docker-bake.hcl +++ b/build/docker-bake.hcl @@ -15,144 +15,135 @@ target "build-common" { } target "5_9_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.9.0", "ghcr.io/n0rthernl1ghts/wordpress:5.9.0"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=5_9_0_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=5_9_0_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:5.9.0", "ghcr.io/n0rthernl1ghts/wordpress:5.9.0"] + args = { WP_VERSION = "5.9.0" } - - # Cache - cache-from = ["type=gha,scope=5_9_0_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=5_9_0_${BAKE_LOCAL_PLATFORM}"] } target "5_9_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.9.1", "ghcr.io/n0rthernl1ghts/wordpress:5.9.1"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=5_9_1_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=5_9_1_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:5.9.1", "ghcr.io/n0rthernl1ghts/wordpress:5.9.1"] + args = { WP_VERSION = "5.9.1" } - - # Cache - cache-from = ["type=gha,scope=5_9_1_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=5_9_1_${BAKE_LOCAL_PLATFORM}"] } target "5_9_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:5.9.2", "ghcr.io/n0rthernl1ghts/wordpress:5.9.2"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=5_9_2_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=5_9_2_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:5.9.2", "ghcr.io/n0rthernl1ghts/wordpress:5.9.2"] + args = { WP_VERSION = "5.9.2" } - - # Cache - cache-from = ["type=gha,scope=5_9_2_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=5_9_2_${BAKE_LOCAL_PLATFORM}"] } target "5_9_3" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=5_9_3_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=5_9_3_${BAKE_LOCAL_PLATFORM}"] + tags = [ "docker.io/nlss/wordpress:5", "docker.io/nlss/wordpress:5.9", "docker.io/nlss/wordpress:5.9.3", "ghcr.io/n0rthernl1ghts/wordpress:5", "ghcr.io/n0rthernl1ghts/wordpress:5.9", "ghcr.io/n0rthernl1ghts/wordpress:5.9.3" ] + args = { WP_VERSION = "5.9.3" } - - # Cache - cache-from = ["type=gha,scope=5_9_3_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=5_9_3_${BAKE_LOCAL_PLATFORM}"] } target "6_0_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:6.0.0", "ghcr.io/n0rthernl1ghts/wordpress:6.0.0"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_0_0_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_0_0_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:6.0.0", "ghcr.io/n0rthernl1ghts/wordpress:6.0.0"] args = { WP_VERSION = "6.0.0" } - - # Cache - cache-from = ["type=gha,scope=6_0_0_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_0_0_${BAKE_LOCAL_PLATFORM}"] } target "6_0_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:6.0.1", "ghcr.io/n0rthernl1ghts/wordpress:6.0.1"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_0_1_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_0_1_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:6.0.1", "ghcr.io/n0rthernl1ghts/wordpress:6.0.1"] + args = { WP_VERSION = "6.0.1" } - - # Cache - cache-from = ["type=gha,scope=6_0_1_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_0_1_${BAKE_LOCAL_PLATFORM}"] } target "6_0_2" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:6.0.2", "ghcr.io/n0rthernl1ghts/wordpress:6.0.2"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_0_2_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_0_2_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:6.0.2", "ghcr.io/n0rthernl1ghts/wordpress:6.0.2"] + args = { WP_VERSION = "6.0.2" } - - # Cache - cache-from = ["type=gha,scope=6_0_2_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_0_2_${BAKE_LOCAL_PLATFORM}"] } target "6_0_3" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:6.0.3", "ghcr.io/n0rthernl1ghts/wordpress:6.0.3"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_0_3_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_0_3_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:6.0.3", "ghcr.io/n0rthernl1ghts/wordpress:6.0.3"] + args = { WP_VERSION = "6.0.3" } - - # Cache - cache-from = ["type=gha,scope=6_0_3_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_0_3_${BAKE_LOCAL_PLATFORM}"] } target "6_1_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] - tags = ["docker.io/nlss/wordpress:6.1.0", "ghcr.io/n0rthernl1ghts/wordpress:6.1.0"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_1_0_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_1_0_${BAKE_LOCAL_PLATFORM}"] + tags = ["docker.io/nlss/wordpress:6.1.0", "ghcr.io/n0rthernl1ghts/wordpress:6.1.0"] + args = { WP_VERSION = "6.1.0" } - - # Cache - cache-from = ["type=gha,scope=6_1_0_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_1_0_${BAKE_LOCAL_PLATFORM}"] } target "6_1_1" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_1_1_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_1_1_${BAKE_LOCAL_PLATFORM}"] + tags = [ "docker.io/nlss/wordpress:6.1", "docker.io/nlss/wordpress:6.1.1", "ghcr.io/n0rthernl1ghts/wordpress:6.1", "ghcr.io/n0rthernl1ghts/wordpress:6.1.1" ] + args = { WP_VERSION = "6.1.1" } - - # Cache - cache-from = ["type=gha,scope=6_1_1_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_1_1_${BAKE_LOCAL_PLATFORM}"] } target "6_2_0" { - inherits = ["build-dockerfile", "build-platforms", "build-common"] + inherits = ["build-dockerfile", "build-platforms", "build-common"] + cache-from = ["type=gha,scope=6_2_0_${BAKE_LOCAL_PLATFORM}"] + cache-to = ["type=gha,mode=max,scope=6_2_0_${BAKE_LOCAL_PLATFORM}"] + tags = [ "docker.io/nlss/wordpress:6", "docker.io/nlss/wordpress:6.2", "docker.io/nlss/wordpress:6.2.0", "docker.io/nlss/wordpress:latest", "ghcr.io/n0rthernl1ghts/wordpress:6", "ghcr.io/n0rthernl1ghts/wordpress:6.2", "ghcr.io/n0rthernl1ghts/wordpress:6.2.0", "ghcr.io/n0rthernl1ghts/wordpress:latest" ] + args = { WP_VERSION = "6.2.0" } - - # Cache - cache-from = ["type=gha,scope=6_2_0_${BAKE_LOCAL_PLATFORM}"] - cache-to = ["type=gha,mode=max,scope=6_2_0_${BAKE_LOCAL_PLATFORM}"] } \ No newline at end of file