Update travis ci settings

pull/411/head
khs1994 2019-05-13 23:06:39 +08:00
parent 4f48fc2066
commit 1c1d81bd49
No known key found for this signature in database
GPG Key ID: 0A380828B1C243A7
1 changed files with 8 additions and 7 deletions

View File

@ -20,11 +20,11 @@ after_success:
- echo "FROM nginx:1.13.8-alpine" >> Dockerfile - echo "FROM nginx:1.13.8-alpine" >> Dockerfile
- echo "COPY _book /usr/share/nginx/html" >> Dockerfile - echo "COPY _book /usr/share/nginx/html" >> Dockerfile
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build -t dockerpracticecn/docker_practice . - docker build -t dockerpracticecn/docker_practice:us-en .
- docker run -dit --rm -p 4000:80 dockerpracticecn/docker_practice - docker run -dit --rm -p 4000:80 dockerpracticecn/docker_practice:us-en
- sleep 5 - sleep 5
- curl 127.0.0.1:4000 - curl 127.0.0.1:4000
- docker push dockerpracticecn/docker_practice - docker push dockerpracticecn/docker_practice:us-en
- cd _book - cd _book
- git init - git init
- git remote add origin "$REPO" - git remote add origin "$REPO"
@ -35,7 +35,7 @@ after_success:
env: env:
global: global:
- DEPLOY_BRANCH: pages - DEPLOY_BRANCH: pages-us-en
# - DEPLOY_BRANCH: legacy-pages # - DEPLOY_BRANCH: legacy-pages
- REPO: git@github.com:yeasy/docker_practice.git - REPO: git@github.com:yeasy/docker_practice.git
@ -45,6 +45,7 @@ addons:
branches: branches:
only: only:
- master - english
- dev # - master
# - docker-legacy # - dev
# - docker-legacy