diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index fe8f10e573..b092cb2fb6 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -34,8 +34,8 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov - - name: Print docker-compose version - run: docker-compose --version + - name: Print docker compose version + run: docker compose --version - name: run ${{ matrix.kind }} tests run: cargo llvm-cov run -p tremor-cli --lcov --output-path lcov.txt -- test --timeout 300 ${{ matrix.kind }} tremor-cli/tests --excludes tcp-reuseport diff --git a/Makefile b/Makefile index b49e5eeabe..ea797721f1 100644 --- a/Makefile +++ b/Makefile @@ -43,12 +43,12 @@ help: ############################################################################### image: - docker-compose build + docker compose build demo: image - -docker-compose -f demo/demo.yaml rm -fsv - -docker-compose -f demo/demo.yaml up - -docker-compose -f demo/demo.yaml rm -fsv + -docker compose -f demo/demo.yaml rm -fsv + -docker compose -f demo/demo.yaml up + -docker compose -f demo/demo.yaml rm -fsv it-clean: -find tremor-cli/tests -name '*.log' | xargs rm diff --git a/README.md b/README.md index 3eddf5acb7..c2e7e2c803 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ We publish our images with a set of different tags as explained below ### Building the Docker Image -Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker-compose build`. Both will create an image called `tremorproject/tremor:latest`. +Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker compose build`. Both will create an image called `tremorproject/tremor:latest`. Note that since the image is building tremor in release mode it requires some serious resources. We recommend allowing docker to use at least **12 but better 16 gigabytes of memory** and as many cores as there are to spare. Depending on the system building, the image can take up to an hour.