diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fb7faa9..bf8cf1d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -28,7 +28,6 @@ /.editorconfig/ @khs1994 /.gitattributes @khs1994 /.gitignore @khs1994 -/.travis.yml @khs1994 /_config.yml @yeasy @khs1994 /book.json @yeasy @khs1994 /CHANGELOG.md @yeasy @khs1994 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5ba4edc..445529d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,16 +7,58 @@ name: CI jobs: build: - name: Build GitBook + name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@master with: fetch-depth: 2 - - name: Build + - name: Build Gitbook uses: docker://yeasy/docker_practice with: args: build + - name: Build Gitbook Docker Image + if: github.repository == 'docker-practice/docker_practice' + run: | + sudo chmod -R 777 _book + echo "FROM nginx:alpine" >> Dockerfile + echo "COPY _book /usr/share/nginx/html" >> Dockerfile + echo "COPY .docker/docker-entrypoint.sh /" >> Dockerfile + echo "ENTRYPOINT [\"/docker-entrypoint.sh\"]" >> Dockerfile + + export VCS_REF=`git rev-parse --short HEAD` + + docker build \ + -t dockerpracticesig/docker_practice \ + -t dockerpracticesig/docker_practice:gitbook \ + --label org.opencontainers.image.revision=$VCS_REF \ + --label org.opencontainers.image.source="https://github.com/yeasy/docker_practice" \ + --label maintainer="https://github.com/docker-practice" \ + . + + docker run -d --rm -p 4000:80 dockerpracticesig/docker_practice + + sleep 5 + curl 127.0.0.1:4000 + + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + docker push dockerpracticesig/docker_practice + docker push dockerpracticesig/docker_practice:gitbook + env: + DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}} + DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}} + - name: Upload Gitbook dist + uses: docker://pcit/pages + if: github.repository == 'docker-practice/docker_practice' + env: + PCIT_EMAIL: khs1994@khs1994.com + PCIT_GIT_TOKEN: ${{ secrets.PCIT_GIT_TOKEN }} + PCIT_GIT_URL: github.com/docker-practice/zh-cn + PCIT_KEEP_HISTORY: "true" + PCIT_LOCAL_DIR: _book + PCIT_MESSAGE: Build from yeasy/docker_practice@${{github.sha}} + PCIT_TARGET_BRANCH: master + PCIT_USERNAME: khs1994 - name: vuepress run: | sudo rm -rf _book @@ -73,7 +115,7 @@ jobs: PCIT_GIT_URL: e.coding.net/dpsigs/docker_practice PCIT_KEEP_HISTORY: "true" PCIT_LOCAL_DIR: .vuepress/dist - PCIT_MESSAGE: Sync from yeasy/docker_practice@${{github.sha}} by PCIT + PCIT_MESSAGE: Build from yeasy/docker_practice@${{github.sha}} PCIT_TARGET_BRANCH: master PCIT_USERNAME: ptt0xjqzbke3 - name: Build vuepress docker image diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3f12f43..0000000 --- a/.travis.yml +++ /dev/null @@ -1,65 +0,0 @@ -language: bash - -services: -- docker - -before_install: -- openssl aes-256-cbc -K $encrypted_6cc8cff04075_key -iv $encrypted_6cc8cff04075_iv - -in .travis/id_rsa.enc -out ~/.ssh/id_rsa -d -- chmod 600 ~/.ssh/id_rsa -- export TZ='Asia/Shanghai' -- date -- git config --global user.name "khs1994" -- git config --global user.email "khs1994@khs1994.com" - -script: -- docker run -it --rm -v $PWD:/srv/gitbook-src yeasy/docker_practice build - -after_success: -- sudo chmod -R 777 _book - -- echo "FROM nginx:alpine" >> Dockerfile -- echo "COPY _book /usr/share/nginx/html" >> Dockerfile -- echo "COPY .docker/docker-entrypoint.sh /" >> Dockerfile -- echo "ENTRYPOINT [\"/docker-entrypoint.sh\"]" >> Dockerfile - -- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin -- export VCS_REF=`git rev-parse --short HEAD` -- | - docker build \ - -t dockerpracticesig/docker_practice \ - -t dockerpracticesig/docker_practice:gitbook \ - --label org.opencontainers.image.revision=$VCS_REF \ - --label org.opencontainers.image.source="https://github.com/yeasy/docker_practice" \ - --label maintainer="https://github.com/docker-practice" \ - . - -- docker run -dit --rm -p 4000:80 dockerpracticesig/docker_practice - -- sleep 5 -- curl 127.0.0.1:4000 - -- docker push dockerpracticesig/docker_practice -- docker push dockerpracticesig/docker_practice:gitbook - -- cd _book -- rm -rf .github/workflows -- git init -- git remote add origin "$DEPLOY_REPO" -- git add . -- COMMIT=`date "+%F %T"` -- git commit -m "Travis CI Site updated $COMMIT yeasy/docker_practice@${TRAVIS_COMMIT}" -- git push -f origin master:"$DEPLOY_BRANCH" - -env: - global: - - DEPLOY_BRANCH: master - - DEPLOY_REPO: git@github.com:docker-practice/zh-cn.git - -addons: - ssh_known_hosts: - - github.com - -branches: - only: - - master diff --git a/.travis/id_rsa.enc b/.travis/id_rsa.enc deleted file mode 100644 index 5e45754..0000000 Binary files a/.travis/id_rsa.enc and /dev/null differ diff --git a/README.md b/README.md index ffe37c5..e000790 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,13 @@ # Docker — 从入门到实践 -[![](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=master)](https://travis-ci.org/yeasy/docker_practice) [![](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) [![](https://img.shields.io/badge/Based-Docker%20CE%20v20.10-blue.svg)](https://github.com/docker/docker-ce) [![](https://img.shields.io/badge/Docker%20%E6%8A%80%E6%9C%AF%E5%85%A5%E9%97%A8%E4%B8%8E%E5%AE%9E%E6%88%98-jd.com-red.svg)][1] +[![](https://img.shields.io/github/stars/yeasy/docker_practice.svg?style=social&label=Stars)](https://github.com/yeasy/docker_practice) [![](https://img.shields.io/github/release/yeasy/docker_practice/all.svg)](https://github.com/yeasy/docker_practice/releases) [![](https://img.shields.io/badge/Based-Docker%20CE%20v20.10-blue.svg)](https://github.com/docker/docker-ce) [![](https://img.shields.io/badge/Docker%20%E6%8A%80%E6%9C%AF%E5%85%A5%E9%97%A8%E4%B8%8E%E5%AE%9E%E6%88%98-jd.com-red.svg)][1] **v1.3.0** -| 语言 | 构建状态 | - | -| :------------- | :------------- | :--- | -| [zh-hans](https://github.com/yeasy/docker_practice) | [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=master)](https://travis-ci.org/yeasy/docker_practice)| [阅读](https://vuepress.mirror.docker-practice.com/) | -| [us-en](https://github.com/yeasy/docker_practice/tree/english) | [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=english)](https://travis-ci.org/yeasy/docker_practice)| [阅读](https://docker_practice.gitee.io/us-en) | -| [zh-hant](https://github.com/yeasy/docker_practice/tree/zh-Hant) | [![](https://travis-ci.org/yeasy/docker_practice.svg?branch=zh-hant)](https://travis-ci.org/yeasy/docker_practice)| [阅读](https://docker_practice.gitee.io/zh-hant) | +| 语言 | - | +| :------------- | :--- | +| [简体中文](https://github.com/yeasy/docker_practice) | [阅读](https://vuepress.mirror.docker-practice.com/) | +| [us-en](https://github.com/yeasy/docker_practice/tree/english) | [阅读](https://docker_practice.gitee.io/us-en) | [Docker](https://www.docker.com) 是个划时代的开源项目，它彻底释放了计算虚拟化的威力，极大提高了应用的维护效率，降低了云计算应用开发的成本！使用 Docker，可以让应用的部署、测试和分发都变得前所未有的高效和轻松！ diff --git a/docker-compose.yml b/docker-compose.yml index 6249947..598a48c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: # $ docker run -it --rm -p 4000:80 dockerpracticesig/docker_practice offline: - # this image build by travis ci + # this image build by GitHub Action image: dockerpracticesig/docker_practice ports: - 4000:80