不要怂,就是干,撸起袖子干!

Commit 1e6f9af1 by Andrew Vereshchak Committed by GitHub

refactor(ci): improve database wait script (#12132)

1 parent 7b671d28
Showing with 7 additions and 6 deletions
...@@ -27,12 +27,13 @@ env: ...@@ -27,12 +27,13 @@ env:
before_script: before_script:
# setup docker # setup docker
- "if [ $MARIADB_VER ]; then export MARIADB_ENTRYPOINT=$TRAVIS_BUILD_DIR/test/config/mariadb; 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 [ $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 [ $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" - wait_for() { docker run --net sequelize_default jwilder/dockerize -timeout 2m -wait "$1"; }
- "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 wait_for tcp://${POSTGRES_VER}:5432; 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 wait_for tcp://${MARIADB_VER}:3306; fi
- if [ $MYSQL_VER ]; then wait_for tcp://${MYSQL_VER}:3306; fi
script: script:
- |- - |-
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!