Fix DB host and port

sue445 · Jan 19, 2020 · 6affdaa · 6affdaa
1 parent 8c9b56f
commit 6affdaa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,21 +52,21 @@ jobs:
       mysql:
         image: mysql:8
         ports:
-          - 3306
+          - 3307:3306
         env:
           MYSQL_ROOT_PASSWORD: root
       postgresql:
         image: postgres:10-alpine
         ports:
-          - 5432
+          - 5432:5432
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       oracle:
         image: deepdiver/docker-oracle-xe-11g
         ports:
-          - 1521
+          - 1521:1521
         env:
           ORACLE_SYSTEM_PASSWORD: oracle
 
@@ -101,7 +101,8 @@ jobs:
           set -xe
           ./ci/build.sh
         env:
-          MYSQL_PORT: ${{ job.services.mysql.ports['3306'] }}
+          # MYSQL_PORT: ${{ job.services.mysql.ports['3306'] }}
+          MYSQL_PORT: 3306
           POSTGRESQL_PORT: ${{ job.services.postgresql.ports['5432'] }}
           ORACLE_PORT: ${{ job.services.oracle.ports['1521'] }}
 

diff --git a/ci/database.yml.mysql b/ci/database.yml.mysql
@@ -5,3 +5,4 @@ test:
   password: root
   encoding: utf8
   port: <%= ENV["MYSQL_PORT"] %>
+  host: mysql
diff --git a/ci/database.yml.oracle b/ci/database.yml.oracle
@@ -1,5 +1,5 @@
 test:
   adapter: oracle_enhanced
-  database: //localhost:<%= ENV["ORACLE_PORT"] %>/xe
+  database: //oracle:<%= ENV["ORACLE_PORT"] %>/xe
   username: system
   password: oracle
diff --git a/ci/database.yml.postgresql b/ci/database.yml.postgresql
@@ -4,4 +4,4 @@ test:
   username: postgres
   password: postgres
   port: <%= ENV["POSTGRESQL_PORT"] %>
-  host: localhost
+  host: postgresql