From 100e2cf5818c1c7d950d3c0be7ffd17a63cff27e Mon Sep 17 00:00:00 2001 From: slvrtrn Date: Mon, 5 Aug 2024 15:10:01 +0200 Subject: [PATCH] Revert add docker compose / CI change --- .docker/clickhouse/single_node/config.xml | 54 ----------------------- .docker/clickhouse/users.xml | 34 -------------- .github/workflows/ci.yml | 16 +++---- docker-compose.yml | 15 ------- 4 files changed, 5 insertions(+), 114 deletions(-) delete mode 100644 .docker/clickhouse/single_node/config.xml delete mode 100644 .docker/clickhouse/users.xml delete mode 100644 docker-compose.yml diff --git a/.docker/clickhouse/single_node/config.xml b/.docker/clickhouse/single_node/config.xml deleted file mode 100644 index 218229c..0000000 --- a/.docker/clickhouse/single_node/config.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - 8123 - 9000 - - users.xml - default - default - - 5368709120 - - /var/lib/clickhouse/ - /var/lib/clickhouse/tmp/ - /var/lib/clickhouse/user_files/ - /var/lib/clickhouse/access/ - 3 - - - debug - /var/log/clickhouse-server/clickhouse-server.log - /var/log/clickhouse-server/clickhouse-server.err.log - 1000M - 10 - 1 - - - - system - query_log
- toYYYYMM(event_date) - 1000 -
- - -
- Access-Control-Allow-Origin - * -
-
- Access-Control-Allow-Headers - accept, origin, x-requested-with, content-type, authorization -
-
- Access-Control-Allow-Methods - POST, GET, OPTIONS -
-
- Access-Control-Max-Age - 86400 -
-
- -
diff --git a/.docker/clickhouse/users.xml b/.docker/clickhouse/users.xml deleted file mode 100644 index 6118853..0000000 --- a/.docker/clickhouse/users.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - random - - - - - - - - ::/0 - - default - default - 1 - - - - - - - 3600 - 0 - 0 - 0 - 0 - 0 - - - - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83418f8..bafb435 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,25 +64,19 @@ jobs: test: runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - clickhouse: [ head, latest ] steps: - uses: actions/checkout@v4 - - name: Start ClickHouse (version - ${{ matrix.clickhouse }}) in Docker - uses: hoverkraft-tech/compose-action@v2.0.1 - env: - CLICKHOUSE_VERSION: ${{ matrix.clickhouse }} - with: - compose-file: 'docker-compose.yml' - down-flags: '--volumes' - run: rustup show active-toolchain -v - run: cargo test - run: cargo test --no-default-features - run: cargo test --features uuid,time - run: cargo test --all-features + services: + clickhouse: + image: clickhouse/clickhouse-server + ports: + - 8123:8123 docs: needs: build runs-on: ubuntu-latest diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index f1ab7f0..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.8' -services: - clickhouse: - image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-24.7-alpine}' - container_name: 'clickhouse-rs-clickhouse-server' - ports: - - '8123:8123' - - '9000:9000' - ulimits: - nofile: - soft: 262144 - hard: 262144 - volumes: - - './.docker/clickhouse/single_node/config.xml:/etc/clickhouse-server/config.xml' - - './.docker/clickhouse/users.xml:/etc/clickhouse-server/users.xml'