Skip to content

Commit

Permalink
Remove docker compose v1 (#2187)
Browse files Browse the repository at this point in the history
* remove docker compose v1
  • Loading branch information
hubertdeng123 authored Jun 9, 2023
1 parent e76c234 commit 5c77236
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/problem-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ body:
label: Docker Compose Version
placeholder: 2.6.0 ← should look like this (docker compose version)
description: |
What version of docker-compose are you using to run self-hosted?
You need to use docker-compose --version if you are running < v2.0.0.
What version of docker compose are you using to run self-hosted?
validations:
required: true
- type: textarea
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ jobs:
fail-fast: false
matrix:
include:
# Disabled due to https://github.com/getsentry/self-hosted/issues/1415
# - compose_version: "1.28.0"
# compose_path: "/usr/local/bin"
# - compose_version: "1.29.2"
# compose_path: "/usr/local/bin"
- compose_version: "v2.0.1"
compose_path: "/usr/local/lib/docker/cli-plugins"
- compose_version: "v2.7.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docke
## Requirements

* Docker 19.03.6+
* Compose 1.28.0+
* Compose 2.0.1+
* 4 CPU Cores
* 8 GB RAM
* 20 GB Free Disk Space
Expand Down
2 changes: 1 addition & 1 deletion install/_min-requirements.sh
Original file line number Diff line number Diff line change
@@ -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='1.28.0'
MIN_COMPOSE_VERSION='2.0.1'
MIN_RAM_HARD=3800 # MB
MIN_RAM_SOFT=7800 # MB
MIN_CPU_HARD=2
Expand Down
2 changes: 1 addition & 1 deletion install/dc-detect-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi

echo "${_group}Initializing Docker Compose ..."

# Some environments still use `docker-compose` even for Docker Compose v2.
# To support users that are symlinking to docker-compose
dc_base="$(docker compose version &>/dev/null && echo 'docker compose' || echo 'docker-compose')"
if [[ "$(basename $0)" = "install.sh" ]]; then
dc="$dc_base --ansi never --env-file ${_ENV}"
Expand Down

0 comments on commit 5c77236

Please sign in to comment.