From 97d10edba3265b0ca67dd5dc0c6ca54080e4f40e Mon Sep 17 00:00:00 2001
From: Brandon Pfeifer <bpfeifer@influxdata.com>
Date: Tue, 15 Apr 2025 11:58:46 -0400
Subject: [PATCH] chore: consolidate influxdb3-core and influxdb3-enterprise
into influxdb
---
.circleci/config.yml | 6 ------
{influxdb3-core/3.0 => influxdb/3.0-core}/Dockerfile | 0
{influxdb3-core/3.0 => influxdb/3.0-core}/entrypoint.sh | 0
.../3.0 => influxdb/3.0-enterprise}/Dockerfile | 0
.../3.0 => influxdb/3.0-enterprise}/entrypoint.sh | 0
5 files changed, 6 deletions(-)
rename {influxdb3-core/3.0 => influxdb/3.0-core}/Dockerfile (100%)
rename {influxdb3-core/3.0 => influxdb/3.0-core}/entrypoint.sh (100%)
rename {influxdb3-enterprise/3.0 => influxdb/3.0-enterprise}/Dockerfile (100%)
rename {influxdb3-enterprise/3.0 => influxdb/3.0-enterprise}/entrypoint.sh (100%)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 863fb1d..d9ef2f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,12 +27,6 @@ workflows:
- build:
name: build-influxdb
product: influxdb
- - build:
- name: build-influxdb3-core
- product: influxdb3-core
- - build:
- name: build-influxdb3-enterprise
- product: influxdb3-enterprise
- build:
name: build-kapacitor
product: kapacitor
diff --git a/influxdb3-core/3.0/Dockerfile b/influxdb/3.0-core/Dockerfile
similarity index 100%
rename from influxdb3-core/3.0/Dockerfile
rename to influxdb/3.0-core/Dockerfile
diff --git a/influxdb3-core/3.0/entrypoint.sh b/influxdb/3.0-core/entrypoint.sh
similarity index 100%
rename from influxdb3-core/3.0/entrypoint.sh
rename to influxdb/3.0-core/entrypoint.sh
diff --git a/influxdb3-enterprise/3.0/Dockerfile b/influxdb/3.0-enterprise/Dockerfile
similarity index 100%
rename from influxdb3-enterprise/3.0/Dockerfile
rename to influxdb/3.0-enterprise/Dockerfile
diff --git a/influxdb3-enterprise/3.0/entrypoint.sh b/influxdb/3.0-enterprise/entrypoint.sh
similarity index 100%
rename from influxdb3-enterprise/3.0/entrypoint.sh
rename to influxdb/3.0-enterprise/entrypoint.sh
--
GitLab