Skip to content

Commit f885ece

Browse files
authored
ref(py3): Remove SENTRY_PYTHON3 and -py3 versons (#764)
This is in preparation to make the PY3 version the default for Docker images and self-hosted. It is part **4/5**: 1. ~~Add `-py2` variants for the Python 2 build tags and introduce the `SENTRY_PYTHON2` env variable usage~~ (getsentry/sentry#22460) 2. ~~Switch getsentry/onpremise to Python 3 by default*, introducing the `SENTRY_PYTHON2` env var for Py2 builds via the `-py2` suffix~~ (#763) 3. ~~Move the unsuffixed version of the builds to Python 3~~ (getsentry/sentry#22466) 4. **Remove the `SENTRY_PYTHON3` env var support and `-py3` prefix usage from getsentry/onpremise** 5. Remove tagging of `-py3` builds from getsentry/sentry
1 parent 06fb0d7 commit f885ece

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
env:
3333
COMPOSE_PARALLEL_LIMIT: 10
3434
SENTRY_PYTHON2: ${{ matrix.py2 == '1' || '' }}
35-
SENTRY_PYTHON3: ${{ matrix.py2 != '1' || ''}}
3635
run: |
3736
./install.sh
3837
./test.sh

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ x-sentry-defaults: &sentry_defaults
88
args:
99
- SENTRY_IMAGE
1010
- SENTRY_PYTHON2
11-
- SENTRY_PYTHON3
1211
image: sentry-onpremise-local
1312
depends_on:
1413
- redis

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ echo ""
217217
$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true
218218

219219
# We may not have the set image on the repo (local images) so allow fails
220-
docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3} || true;
220+
docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2} || true;
221221

222222
echo ""
223223
echo "Building and tagging Docker images..."

sentry/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
ARG SENTRY_IMAGE
22
ARG SENTRY_PYTHON2
3-
ARG SENTRY_PYTHON3
4-
FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}${SENTRY_PYTHON3:+-py3}
3+
FROM ${SENTRY_IMAGE}${SENTRY_PYTHON2:+-py2}
54

65
COPY . /usr/src/sentry
76

0 commit comments

Comments
 (0)