fix compose v2 stuff

getsentry · Oct 15, 2021 · 6c92774 · 6c92774
1 parent 9ab5653
commit 6c92774
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,6 +39,9 @@ jobs:
 
       - name: Get Compose
         run: |
+          # Always remove `docker compose` support as that's the newer version
+          # and comes installed by default nowadays.
+          sudo rm -f "/usr/lib/docker/cli-plugins/docker-compose"
           sudo rm -f "${{ matrix.compose_path }}/docker-compose"
           sudo mkdir -p "${{ matrix.compose_path }}"
           sudo curl -L https://github.com/docker/compose/releases/download/${{ matrix.compose_version }}/docker-compose-`uname -s`-`uname -m` -o "${{ matrix.compose_path }}/docker-compose"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -93,7 +93,7 @@ services:
   smtp:
     <<: *restart_policy
     image: tianon/exim4
-    hostname: ${SENTRY_MAIL_HOST:-}
+    hostname: ${SENTRY_MAIL_HOST:-''}
     volumes:
       - "sentry-smtp:/var/spool/exim4"
       - "sentry-smtp-log:/var/log/exim4"