feat(py3): Add Python 3 support via SENTRY_PYTHON3 env variable (#702)

Author: BYK

.github/workflows/test.yml

@@ -12,8 +12,11 @@ env:
   DOCKER_COMPOSE_VERSION: 1.24.1
 jobs:
   test:
+    strategy:
+      matrix:
+        py3: ['', '1']
     runs-on: ubuntu-18.04
-    name: "test"
+    name: "test${{ matrix.py3 == '1' && ' PY3' || ''}}"
     steps:
       - name: Pin docker-compose
         run: |
@@ -28,6 +31,7 @@ jobs:
       - name: Install and test
         env:
           COMPOSE_PARALLEL_LIMIT: 10
+          SENTRY_PYTHON3: ${{ matrix.py3 }}
         run: |
           ./install.sh
           ./test.sh

README.md

@@ -15,6 +15,8 @@ Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docke
 
 To get started with all the defaults, simply clone the repo and run `./install.sh` in your local check-out.
 
+_If you like trying out new things, you can run `SENTRY_PYTHON3=1 ./install.sh` instead to use our brand new Python 3 images. **Keep in mind that Python 3 support is experimental at this point**_
+
 During the install, a prompt will ask if you want to create a user account. If you require that the install not be blocked by the prompt, run `./install.sh --no-user-prompt`.
 
 There may need to be modifications to the included example config files (`sentry/config.example.yml` and `sentry/sentry.conf.example.py`) to accommodate your needs or your environment (such as adding GitHub credentials). If you want to perform these, do them before you run the install script and copy them without the `.example` extensions in the name (such as `sentry/sentry.conf.py`) before running the `install.sh` script.

docker-compose.yml

@@ -7,6 +7,7 @@ x-sentry-defaults: &sentry_defaults
     context: ./sentry
     args:
       - SENTRY_IMAGE
+      - SENTRY_PYTHON3
   image: sentry-onpremise-local
   depends_on:
     - redis
@@ -60,7 +61,6 @@ services:
       nofile:
         soft: 10032
         hard: 10032
-   
   postgres:
     << : *restart_policy
     image: 'postgres:9.6'

install.sh

@@ -207,7 +207,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 || true;
+docker pull ${SENTRY_IMAGE}${SENTRY_PYTHON3:+-py3} || true;
 
 echo ""
 echo "Building and tagging Docker images..."

sentry/Dockerfile

@@ -1,5 +1,6 @@
 ARG SENTRY_IMAGE
-FROM ${SENTRY_IMAGE}
+ARG SENTRY_PYTHON3
+FROM ${SENTRY_IMAGE}${SENTRY_PYTHON3:+-py3}
 
 COPY . /usr/src/sentry