Skip to content

Commit

Permalink
refactor(ci): improve database wait script (#12132)
Browse files Browse the repository at this point in the history
  • Loading branch information
multum committed Apr 19, 2020
1 parent 7b671d2 commit 1e6f9af
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ env:

before_script:
# setup docker
- "if [ $MARIADB_VER ]; then export MARIADB_ENTRYPOINT=$TRAVIS_BUILD_DIR/test/config/mariadb; fi"
- "if [ $MYSQL_VER ]; then export MYSQLDB_ENTRYPOINT=$TRAVIS_BUILD_DIR/test/config/mysql; fi"
- "if [ $POSTGRES_VER ] || [ $MARIADB_VER ] || [ $MYSQL_VER ]; then docker-compose up -d ${POSTGRES_VER} ${MARIADB_VER} ${MYSQL_VER}; fi"
- "if [ $MARIADB_VER ]; then docker run --link ${MARIADB_VER}:db -e CHECK_PORT=3306 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
- "if [ $MYSQL_VER ]; then docker run --link ${MYSQL_VER}:db -e CHECK_PORT=3306 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
- "if [ $POSTGRES_VER ]; then docker run --link ${POSTGRES_VER}:db -e CHECK_PORT=5432 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
- if [ $MARIADB_VER ]; then export MARIADB_ENTRYPOINT=$TRAVIS_BUILD_DIR/test/config/mariadb; fi
- if [ $MYSQL_VER ]; then export MYSQLDB_ENTRYPOINT=$TRAVIS_BUILD_DIR/test/config/mysql; fi
- if [ $POSTGRES_VER ] || [ $MARIADB_VER ] || [ $MYSQL_VER ]; then docker-compose up -d ${POSTGRES_VER} ${MARIADB_VER} ${MYSQL_VER}; fi
- wait_for() { docker run --net sequelize_default jwilder/dockerize -timeout 2m -wait "$1"; }
- if [ $POSTGRES_VER ]; then wait_for tcp://${POSTGRES_VER}:5432; fi
- if [ $MARIADB_VER ]; then wait_for tcp://${MARIADB_VER}:3306; fi
- if [ $MYSQL_VER ]; then wait_for tcp://${MYSQL_VER}:3306; fi

script:
- |-
Expand Down

0 comments on commit 1e6f9af

Please sign in to comment.