From 01625f2d7c06a466f8543e845fd9d4499007d507 Mon Sep 17 00:00:00 2001 From: Blair Watt Date: Wed, 17 Jul 2024 16:27:25 +0100 Subject: [PATCH 1/5] CBD-5908: Add container rebuild info --- .../containers/image_info.json | 3 +++ couchbase-exporter/containers/image_info.json | 3 +++ couchbase-fluent-bit/containers/image_info.json | 6 ++++++ .../containers/image_info.json | 6 ++++++ couchbase-operator/containers/image_info.json | 10 ++++++++++ couchbase-server/containers/image_info.json | 16 ++++++++++++++++ server-sandbox/containers/image_info.json | 17 +++++++++++++++++ sync_gateway/containers/image_info.json | 11 +++++++++++ 8 files changed, 72 insertions(+) create mode 100644 couchbase-cloud-native-gateway/containers/image_info.json create mode 100644 couchbase-exporter/containers/image_info.json create mode 100644 couchbase-fluent-bit/containers/image_info.json create mode 100644 couchbase-operator-backup/containers/image_info.json create mode 100644 couchbase-operator/containers/image_info.json create mode 100644 couchbase-server/containers/image_info.json create mode 100644 server-sandbox/containers/image_info.json create mode 100644 sync_gateway/containers/image_info.json diff --git a/couchbase-cloud-native-gateway/containers/image_info.json b/couchbase-cloud-native-gateway/containers/image_info.json new file mode 100644 index 0000000000..ccb43aa493 --- /dev/null +++ b/couchbase-cloud-native-gateway/containers/image_info.json @@ -0,0 +1,3 @@ +{ + "github_repo": "couchbase/stellar-gateway" +} diff --git a/couchbase-exporter/containers/image_info.json b/couchbase-exporter/containers/image_info.json new file mode 100644 index 0000000000..4976c338d2 --- /dev/null +++ b/couchbase-exporter/containers/image_info.json @@ -0,0 +1,3 @@ +{ + "github_repo": "couchbase/couchbase-exporter" +} diff --git a/couchbase-fluent-bit/containers/image_info.json b/couchbase-fluent-bit/containers/image_info.json new file mode 100644 index 0000000000..ab35d783a9 --- /dev/null +++ b/couchbase-fluent-bit/containers/image_info.json @@ -0,0 +1,6 @@ +{ + "github_repo": "couchbase/couchbase-fluent-bit", + "eol_patterns": [ + "^1\\.2\\.1$" + ] +} diff --git a/couchbase-operator-backup/containers/image_info.json b/couchbase-operator-backup/containers/image_info.json new file mode 100644 index 0000000000..9f46e58e70 --- /dev/null +++ b/couchbase-operator-backup/containers/image_info.json @@ -0,0 +1,6 @@ +{ + "github_repo": "couchbaselabs/couchbase-operator-backup", + "eol_patterns": [ + "^6\\." + ] +} diff --git a/couchbase-operator/containers/image_info.json b/couchbase-operator/containers/image_info.json new file mode 100644 index 0000000000..0468821484 --- /dev/null +++ b/couchbase-operator/containers/image_info.json @@ -0,0 +1,10 @@ +{ + "dockerfiles": { + "docker": "docker/couchbase-operator/Dockerfile", + "redhat": "docker/couchbase-operator/Dockerfile.rhel" + }, + "github_repo": "couchbase/couchbase-operator", + "eol_patterns": [ + "^6\\." + ] +} diff --git a/couchbase-server/containers/image_info.json b/couchbase-server/containers/image_info.json new file mode 100644 index 0000000000..a05c6b6891 --- /dev/null +++ b/couchbase-server/containers/image_info.json @@ -0,0 +1,16 @@ +{ + "github_repo": "couchbase/docker", + "eol_patterns": [ + "^1\\.", + "^2\\.", + "^3\\.", + "^4\\.", + "^5\\.", + "^6\\.", + "^7\\.0\\." + ], + "absences": [{ + "registry": "redhat", + "edition": "community" + }] +} diff --git a/server-sandbox/containers/image_info.json b/server-sandbox/containers/image_info.json new file mode 100644 index 0000000000..8882f22893 --- /dev/null +++ b/server-sandbox/containers/image_info.json @@ -0,0 +1,17 @@ +{ + "github_repo": "couchbase/docker", + "eol_patterns": [ + "^1\\.", + "^2\\.", + "^3\\.", + "^4\\.", + "^5\\.", + "^6\\.", + "^7\\.0\\." + ], + "absences": [{ + "registry": "redhat" + },{ + "edition": "community" + }] +} diff --git a/sync_gateway/containers/image_info.json b/sync_gateway/containers/image_info.json new file mode 100644 index 0000000000..087489893b --- /dev/null +++ b/sync_gateway/containers/image_info.json @@ -0,0 +1,11 @@ +{ + "github_repo": "couchbase/docker", + "eol_patterns": [ + "^1\\.", + "^2\\." + ], + "absences": [{ + "registry": "redhat", + "edition": "community" + }] +} From 91bdddc0e4fb3a45366cffa6c6e5e4551b7ca205 Mon Sep 17 00:00:00 2001 From: Blair Watt Date: Thu, 18 Jul 2024 16:30:48 +0100 Subject: [PATCH 2/5] Add editions --- couchbase-server/containers/image_info.json | 4 ++++ sync_gateway/containers/image_info.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/couchbase-server/containers/image_info.json b/couchbase-server/containers/image_info.json index a05c6b6891..4aba5d3f03 100644 --- a/couchbase-server/containers/image_info.json +++ b/couchbase-server/containers/image_info.json @@ -9,6 +9,10 @@ "^6\\.", "^7\\.0\\." ], + "editions": [ + "community", + "enterprise" + ], "absences": [{ "registry": "redhat", "edition": "community" diff --git a/sync_gateway/containers/image_info.json b/sync_gateway/containers/image_info.json index 087489893b..03ae03b6ba 100644 --- a/sync_gateway/containers/image_info.json +++ b/sync_gateway/containers/image_info.json @@ -4,6 +4,10 @@ "^1\\.", "^2\\." ], + "editions": [ + "community", + "enterprise" + ], "absences": [{ "registry": "redhat", "edition": "community" From f09938e4d56b769075223a8c6df87c458aef7489 Mon Sep 17 00:00:00 2001 From: Blair Watt Date: Fri, 13 Sep 2024 09:52:09 +0100 Subject: [PATCH 3/5] Fix server-sandbox info --- server-sandbox/containers/image_info.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server-sandbox/containers/image_info.json b/server-sandbox/containers/image_info.json index 8882f22893..1eda075852 100644 --- a/server-sandbox/containers/image_info.json +++ b/server-sandbox/containers/image_info.json @@ -9,9 +9,6 @@ "^6\\.", "^7\\.0\\." ], - "absences": [{ - "registry": "redhat" - },{ - "edition": "community" - }] + "editions": ["enterprise"], + "absences": [{ "registry": "redhat" }] } From 4d050fb68bf5de33f7748c47c17242e651a8c17e Mon Sep 17 00:00:00 2001 From: Blair Watt Date: Fri, 13 Sep 2024 12:08:44 +0100 Subject: [PATCH 4/5] Rename registries --- couchbase-server/containers/image_info.json | 2 +- server-sandbox/containers/image_info.json | 2 +- sync_gateway/containers/image_info.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/couchbase-server/containers/image_info.json b/couchbase-server/containers/image_info.json index 4aba5d3f03..139630d4d2 100644 --- a/couchbase-server/containers/image_info.json +++ b/couchbase-server/containers/image_info.json @@ -14,7 +14,7 @@ "enterprise" ], "absences": [{ - "registry": "redhat", + "registry": "rhcc", "edition": "community" }] } diff --git a/server-sandbox/containers/image_info.json b/server-sandbox/containers/image_info.json index 1eda075852..f9bdcdf51f 100644 --- a/server-sandbox/containers/image_info.json +++ b/server-sandbox/containers/image_info.json @@ -10,5 +10,5 @@ "^7\\.0\\." ], "editions": ["enterprise"], - "absences": [{ "registry": "redhat" }] + "absences": [{ "registry": "rhcc" }] } diff --git a/sync_gateway/containers/image_info.json b/sync_gateway/containers/image_info.json index 03ae03b6ba..6c2612cf9f 100644 --- a/sync_gateway/containers/image_info.json +++ b/sync_gateway/containers/image_info.json @@ -9,7 +9,7 @@ "enterprise" ], "absences": [{ - "registry": "redhat", + "registry": "rhcc", "edition": "community" }] } From 68ad25110a985160e1e5085846faa04e106aa24c Mon Sep 17 00:00:00 2001 From: Blair Watt Date: Fri, 13 Sep 2024 13:28:42 +0100 Subject: [PATCH 5/5] Fix registry names --- couchbase-operator/containers/image_info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/couchbase-operator/containers/image_info.json b/couchbase-operator/containers/image_info.json index 0468821484..110f23004d 100644 --- a/couchbase-operator/containers/image_info.json +++ b/couchbase-operator/containers/image_info.json @@ -1,7 +1,7 @@ { "dockerfiles": { - "docker": "docker/couchbase-operator/Dockerfile", - "redhat": "docker/couchbase-operator/Dockerfile.rhel" + "dockerhub": "docker/couchbase-operator/Dockerfile", + "rhcc": "docker/couchbase-operator/Dockerfile.rhel" }, "github_repo": "couchbase/couchbase-operator", "eol_patterns": [