Docker examples cleanup (#496)

QuesmaOrg · Jul 9, 2024 · dbf5c4e · dbf5c4e
1 parent 4bd87e1
commit dbf5c4e
Show file tree

Hide file tree

Showing 97 changed files with 8 additions and 4,298 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -75,7 +75,7 @@ jobs:
 
       - name: Build and start docker-compose
         timeout-minutes: 10
-        run: docker-compose -f docker/e2e-old.yml up -d
+        run: docker-compose -f ci/e2e-old.yml up -d
 
       - name: Wait until Elasticsearch is up
         timeout-minutes: 6

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -120,7 +120,7 @@ jobs:
       - name: Build and export
         uses: docker/build-push-action@v6
         with:
-          context: docker/${{ matrix.module }}/.
+          context: ci/${{ matrix.module }}/.
           tags: ${{ matrix.module }}:latest
           outputs: type=docker,dest=/tmp/image.tar
           cache-from: type=gha
@@ -161,7 +161,7 @@ jobs:
 
       - name: Build and start docker-compose
         timeout-minutes: 10
-        run: docker-compose -f docker/ci.yml up -d
+        run: docker-compose -f ci/ci.yml up -d
 
       - name: Wait until services are healthy
         timeout-minutes: 6
@@ -176,8 +176,8 @@ jobs:
 
       - name: Print docker status
         if: failure()
-        run: docker-compose -f docker/ci.yml ps
+        run: docker-compose -f ci/ci.yml ps
 
       - name: Print docker-compose logs
         if: failure()
-        run: docker-compose -f docker/ci.yml logs
+        run: docker-compose -f ci/ci.yml logs
diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,8 @@ mitmproxy/query/*.txt
 .env
 .env*
 .DS_Store
-docker/quesma/logs/err.log
-docker/quesma/logs/quesma.log
+ci/quesma/logs/err.log
+ci/quesma/logs/quesma.log
 quesma/logs/err.log
 quesma/logs/quesma.log
 heap.out

diff --git a/bin/down.sh b/bin/down.sh
diff --git a/bin/lib.sh b/bin/lib.sh
diff --git a/bin/logs.sh b/bin/logs.sh
diff --git a/bin/prune.sh b/bin/prune.sh
diff --git a/bin/rebuild-attach.sh b/bin/rebuild-attach.sh
diff --git a/bin/rebuild.sh b/bin/rebuild.sh
diff --git a/bin/up.sh b/bin/up.sh
diff --git a/docker/ci.yml → ci/ci.yml b/docker/ci.yml → ci/ci.yml
diff --git a/docker/clickhouse/config-with-ssl.xml → ci/clickhouse/config-with-ssl.xml b/docker/clickhouse/config-with-ssl.xml → ci/clickhouse/config-with-ssl.xml
diff --git a/docker/e2e-data-generator/Dockerfile → ci/e2e-data-generator/Dockerfile b/docker/e2e-data-generator/Dockerfile → ci/e2e-data-generator/Dockerfile
diff --git a/docker/e2e-data-generator/db_sender.go → ci/e2e-data-generator/db_sender.go b/docker/e2e-data-generator/db_sender.go → ci/e2e-data-generator/db_sender.go
diff --git a/docker/e2e-data-generator/go.mod → ci/e2e-data-generator/go.mod b/docker/e2e-data-generator/go.mod → ci/e2e-data-generator/go.mod
diff --git a/docker/e2e-data-generator/main.go → ci/e2e-data-generator/main.go b/docker/e2e-data-generator/main.go → ci/e2e-data-generator/main.go
diff --git a/.../e2e-data-generator/tables/e2e_table_1.go → ci/e2e-data-generator/tables/e2e_table_1.go b/.../e2e-data-generator/tables/e2e_table_1.go → ci/e2e-data-generator/tables/e2e_table_1.go
diff --git a/docker/e2e-old.yml → ci/e2e-old.yml b/docker/e2e-old.yml → ci/e2e-old.yml
diff --git a/docker/e2e.yml → ci/e2e.yml b/docker/e2e.yml → ci/e2e.yml
diff --git a/docker/kibana/.gitignore → ci/kibana/.gitignore b/docker/kibana/.gitignore → ci/kibana/.gitignore
diff --git a/docker/kibana/add_e2e_data_views.sh → ci/kibana/add_e2e_data_views.sh b/docker/kibana/add_e2e_data_views.sh → ci/kibana/add_e2e_data_views.sh
diff --git a/docker/kibana/add_logs_view.sh → ci/kibana/add_logs_view.sh b/docker/kibana/add_logs_view.sh → ci/kibana/add_logs_view.sh
diff --git a/docker/kibana/add_osd_sample_data.sh → ci/kibana/add_osd_sample_data.sh b/docker/kibana/add_osd_sample_data.sh → ci/kibana/add_osd_sample_data.sh
diff --git a/docker/kibana/add_sample_data.sh → ci/kibana/add_sample_data.sh b/docker/kibana/add_sample_data.sh → ci/kibana/add_sample_data.sh
diff --git a/docker/kibana/lib.sh → ci/kibana/lib.sh b/docker/kibana/lib.sh → ci/kibana/lib.sh
diff --git a/docker/kibana/qa/add_kibana_view.sh → ci/kibana/qa/add_kibana_view.sh b/docker/kibana/qa/add_kibana_view.sh → ci/kibana/qa/add_kibana_view.sh
diff --git a/docker/log-generator/Dockerfile → ci/log-generator/Dockerfile b/docker/log-generator/Dockerfile → ci/log-generator/Dockerfile
diff --git a/docker/log-generator/README.md → ci/log-generator/README.md b/docker/log-generator/README.md → ci/log-generator/README.md
diff --git a/docker/log-generator/logger.go → ci/log-generator/logger.go b/docker/log-generator/logger.go → ci/log-generator/logger.go
diff --git a/docker/quesma/config/.gitignore → ci/quesma/config/.gitignore b/docker/quesma/config/.gitignore → ci/quesma/config/.gitignore
diff --git a/docker/quesma/config/ci-config.yaml → ci/quesma/config/ci-config.yaml b/docker/quesma/config/ci-config.yaml → ci/quesma/config/ci-config.yaml
diff --git a/.../device-log-generator/assets/.placeholder → ci/quesma/logs/.gitkeep b/.../device-log-generator/assets/.placeholder → ci/quesma/logs/.gitkeep
diff --git a/docker/README.md b/docker/README.md
diff --git a/docker/clean-clickhouse/.env.example b/docker/clean-clickhouse/.env.example
diff --git a/docker/clean-clickhouse/Dockerfile b/docker/clean-clickhouse/Dockerfile
diff --git a/docker/clean-clickhouse/README.md b/docker/clean-clickhouse/README.md
diff --git a/docker/clean-clickhouse/clean.py b/docker/clean-clickhouse/clean.py
diff --git a/docker/clean-clickhouse/schema/01-device_logs.sql b/docker/clean-clickhouse/schema/01-device_logs.sql
diff --git a/docker/clean-clickhouse/schema/02-windows_logs.sql b/docker/clean-clickhouse/schema/02-windows_logs.sql
diff --git a/docker/clean-clickhouse/schema/03-type_logs.sql b/docker/clean-clickhouse/schema/03-type_logs.sql
diff --git a/docker/clean-clickhouse/schema/04-type-logs-insert.sql b/docker/clean-clickhouse/schema/04-type-logs-insert.sql