From 5212bcb78725161ff42e14dd9f34b645aeabb33d Mon Sep 17 00:00:00 2001
From: Friedrich Lindenberg <friedrich@pudo.org>
Date: Sun, 15 Mar 2020 13:44:43 +0100
Subject: [PATCH] Try to be clever about service ports

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35e9d7f..4bde969 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: dataset
         ports:
-        - 5432:5432
+        - 5432/tcp
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       mariadb:
         image: mariadb
@@ -24,7 +24,7 @@ jobs:
           MYSQL_DATABASE: dataset
           MYSQL_ROOT_PASSWORD: mariadb
         ports:
-        - 3306:3306
+        - 3306/tcp
         options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
     steps:
@@ -49,12 +49,12 @@ jobs:
         make test
     - name: Run PostgreSQL tests
       env:
-        DATABASE_URI: 'postgresql+psycopg2://postgres:postgres@postgres/dataset'
+        DATABASE_URI: 'postgresql+psycopg2://postgres:postgres@postgres:${{ job.services.postgres.ports[5432] }}/dataset'
       run: |
         make test
     - name: Run MariaDB tests
       env:
-        DATABASE_URI: 'mysql+pymysql://mariadb:mariadb@mariadb/dataset?charset=utf8'
+        DATABASE_URI: 'mysql+pymysql://mariadb:mariadb@mariadb:${{ job.services.mariadb.ports[3306] }}/dataset?charset=utf8'
       run: |
         make test
     - name: Build a distribution