diff --git a/.drone.yml b/.drone.yml index 04aeebc..8e6c9aa 100755 --- a/.drone.yml +++ b/.drone.yml @@ -1,39 +1,25 @@ -kind: pipeline # 定义一个管道 -type: docker # 当前管道的类型 -name: test # 当前管道的名称 +kind: pipeline +type: docker +name: test -# ****************** 直接丢掉 默认会直接拉代码 ****************** -#clone: -# disable: true #禁用默认克隆 - - -steps: # 定义管道的执行步骤 -# - name: clone-test -# image: alpine/git -# commands: -# - git clone http://gong.cool:3001/gitea/hyperf.git #自定义克隆地址 http://gong.cool:3001/gitea/hyperf.git -# - git version -# - pwd -# - ls -a - # ****************** 直接丢掉 默认会直接拉代码 ****************** - - - name: build # 步骤名称 - image: gong921123/debian-nginx-php114-74:latest # 当前步骤使用的镜像 image: composer:latest 这里还是使用自己的环境 否则可能一些依赖版本问题会出现,这里的composer是 2.5.4 版本 +steps: + - name: build + image: gong921123/debian-nginx-php114-74:latest pull: if-not-exists - commands: # 当前步骤执行的命令 -# - composer -v + commands: + - composer -v - ls -a -# - composer install -v + - composer install -v - name: deploy-push-images - depends_on: # 依赖build管道 + depends_on: - build image: plugins/docker pull: if-not-exists settings: - repo: gong921123/hyperf2 # 推送到dockerhub仓库去 + repo: gong921123/hyperf registry: docker.io - insecure: true # 不使用https + insecure: true username: from_secret: docker_username password: @@ -41,29 +27,32 @@ steps: # 定义管道的执行步骤 dockerfile: docker/Dockerfile tags: ${DRONE_TAG} -# - name: deploy-pull-project -# depends_on: -# - deploy-push-images -# image: appleboy/drone-ssh -# pull: if-not-exists -# settings: -# host: gong.cool -# user: -# from_secret: ssh_username -# password: -# from_secret: ssh_password -# command_timeout: 5m -# port: 22 -# script: -# - echo ====开始部署======= -# # - docker pull gong921123/hyperf:latest -# # - docker rmi $(docker images | grep gong921123/hyperf | awk '{print $3}') -# # - docker rmi $(docker images | grep "" | awk '{print $3}') -# - docker run -itd --name hyperf -p 8001:80 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/hyperf:latest -# - echo ====部署成功======= + - name: deploy-pull-project + depends_on: + - deploy-push-images + image: appleboy/drone-ssh + pull: if-not-exists + settings: + host: gong.cool + user: + from_secret: ssh_username + password: + from_secret: ssh_password + command_timeout: 5m + port: 22 + script: + - echo ====开始部署======= + - docker pull gong921123/hyperf:${DRONE_TAG} + - docker stop $(docker ps | grep gong921123/hyperf | awk '{print $3}') + - docker rm $(docker ps | grep gong921123/hyperf | awk '{print $3}') + - docker rmi $(docker images | grep gong921123/hyperf | awk '{print $3}') + - docker rmi $(docker images | grep "" | awk '{print $3}') + - docker run -itd --name hyperf -p 8001:80 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/hyperf:${DRONE_TAG} + - echo ====部署成功======= -trigger: # 触发条件,并关系 drone不支持同时使用tag和branch作为触发条件 -# branch: # git 分支 -# - develop - event: # 事件 +trigger: + branch: + - develop + event: - tag +# - push diff --git a/.drone3.yml b/.drone3.yml new file mode 100755 index 0000000..0117c56 --- /dev/null +++ b/.drone3.yml @@ -0,0 +1,17 @@ +kind: pipeline # 定义一个管道 +type: docker # 当前管道的类型 +name: test # 当前管道的名称 + +steps: # 定义管道的执行步骤 + - name: clone-test + image: alpine/git + commands: + - git version + - pwd + - ls -a + +trigger: # 触发条件 + branch: # git 分支 + - develop + event: # 事件 + - push # 当推送时触发