From c40b1530d104e9481d172e06dc6810bea0795d5c Mon Sep 17 00:00:00 2001 From: Jann Kleen Date: Wed, 29 May 2024 23:59:22 +0200 Subject: [PATCH] Update minimum docker compose requirement (#3078) * Update minimum docker compose requirement docker compose down is now required. * Update docker compose version to new minimum in CI config. --- .github/workflows/test.yml | 6 +++--- README.md | 2 +- install/_min-requirements.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8acdb98813..e565392c89 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,9 +83,9 @@ jobs: fail-fast: false matrix: customizations: ["disabled", "enabled"] - compose_version: ["v2.0.1", "v2.26.0"] + compose_version: ["v2.19.0", "v2.26.0"] include: - - compose_version: "v2.0.1" + - compose_version: "v2.19.0" compose_path: "/usr/local/lib/docker/cli-plugins" - compose_version: "v2.26.0" compose_path: "/usr/local/lib/docker/cli-plugins" @@ -134,7 +134,7 @@ jobs: - name: Integration Test run: | - if [ "${{ matrix.compose_version }}" = "v2.0.1" ]; then + if [ "${{ matrix.compose_version }}" = "v2.19.0" ]; then pytest --reruns 3 --cov --junitxml=junit.xml _integration-test/ --customizations=${{ matrix.customizations }} else pytest --cov --junitxml=junit.xml _integration-test/ --customizations=${{ matrix.customizations }} diff --git a/README.md b/README.md index 13f4f2b893..7315466c25 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docke ## Requirements * Docker 19.03.6+ -* Compose 2.0.1+ +* Compose 2.19.0+ * 4 CPU Cores * 16 GB RAM * 20 GB Free Disk Space diff --git a/install/_min-requirements.sh b/install/_min-requirements.sh index e756c765d8..f8836db086 100644 --- a/install/_min-requirements.sh +++ b/install/_min-requirements.sh @@ -1,6 +1,6 @@ # Don't forget to update the README and othes docs when you change these! MIN_DOCKER_VERSION='19.03.6' -MIN_COMPOSE_VERSION='2.0.1' +MIN_COMPOSE_VERSION='2.19.0' MIN_RAM_HARD=3800 # MB MIN_RAM_SOFT=7800 # MB MIN_CPU_HARD=2