ci: update docker compose and wait for db image (#1533)

* change docker-compose to docker compose and use eficode/wait-for instead of giorgos/takis

* fix(ci): jwilder/dockerize instead of giorgos/takis

* fix(ci): change hostname to wait for

* test(ci): readd --link

* fix(ci): revert yarn to main

* test(ci): check postgres container name

* test(ci): check mysql container port

* fix(ci): use the whole port for postgres

* test(ci): print docker ps

* test(ci): check the logs of postgres container

* test(ci): check if the container is still alive

* test(ci): check why does the postgres shuts down

* fix(ci): fix docker-compose formatting

---------

Co-authored-by: Michael Shohat <[email protected]>

Author: MichaelShohat

.github/workflows/ci.yml

@@ -26,8 +26,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-mysql:
     strategy:
@@ -47,8 +47,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-sqlite:
     strategy:

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "54320:5432"
     container_name: postgres
     command: >
-      bash -c "sed -i -e 's/# \(zh_TW\|en_US\).UTF-8 UTF-8/\1.UTF-8 UTF-8/' /etc/locale.gen
+      bash -c "sed -i -e 's/# \\(zh_TW\\|en_US\\).UTF-8 UTF-8/\\1.UTF-8 UTF-8/' /etc/locale.gen
       && locale-gen
       && docker-entrypoint.sh postgres"