diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd5809bc139..5cd4f64a1aa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,6 @@ jobs: env: COMPOSE_PARALLEL_LIMIT: 10 SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }} - SENTRY_PYTHON3: ${{ matrix.py2 != '1' || ''}} run: | ./install.sh ./test.sh diff --git a/docker-compose.yml b/docker-compose.yml index 6fb685fdda5..5909226ae47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,6 @@ x-sentry-defaults: &sentry_defaults args: - SENTRY_IMAGE - SENTRY_PYTHON2 - - SENTRY_PYTHON3 image: sentry-onpremise-local depends_on: - redis diff --git a/install.sh b/install.sh index bb123ea6830..2ec1832167a 100755 --- a/install.sh +++ b/install.sh @@ -217,7 +217,7 @@ echo "" $dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true # We may not have the set image on the repo (local images) so allow fails -docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3} || true; +docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2} || true; echo "" echo "Building and tagging Docker images..." diff --git a/sentry/Dockerfile b/sentry/Dockerfile index 8d17146ad8a..812056ead1d 100644 --- a/sentry/Dockerfile +++ b/sentry/Dockerfile @@ -1,7 +1,6 @@ ARG SENTRY_IMAGE ARG SENTRY_PYTHON2 -ARG SENTRY_PYTHON3 -FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3} +FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2} COPY . /usr/src/sentry