fix: test

.drone.yml

@@ -4,11 +4,10 @@ name: test
 
 steps:
     - name: build
-      image: gong921123/debian-nginx-php114-74:latest
-      pull: if-not-exists
+      image: composer:latest
       commands:
-      - composer -v
-      - ls -a
+      - ls
+      - composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/
       - composer install -v
 
     - name: deploy-push-images
@@ -17,42 +16,19 @@ steps:
       image: plugins/docker
       pull: if-not-exists
       settings:
-        repo: gong921123/hyperfa
-        registry: docker.io
+        repo: gong92-socl/hy-test-k8s
+        registry: registry.cn-shanghai.aliyuncs.com
         insecure: true
         username:
-          from_secret: docker_username
+          from_secret: aliyun_docker_name
         password:
-          from_secret: docker_password
+          from_secret: aliyun_docker_password
         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/hyperfa:${DRONE_TAG}
-          - docker stop $(docker ps | grep hyperf | awk  '{print $1}')
-          - docker rm $(docker ps | grep hyperf | awk  '{print $1}')
-          - docker rmi $(docker images | grep gong921123/hyperf | awk  '{print $3}')
-          - docker rmi $(docker images | grep "<none>" | awk  '{print $3}')
-          - docker run -itd --name hyperf  -p 8001:8001 -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/hyperfa:${DRONE_TAG}
-          - echo ====部署成功=======
-
 trigger:
 #  branch:
 #    - develop
   event:
-    - tag
-#    - push
+#    - tag
+    - push

.drone3.yml

@@ -1,17 +1,114 @@
-kind: pipeline  # 定义一个管道
-type: docker    # 当前管道的类型
-name: test      # 当前管道的名称
+kind: pipeline
+type: kubernetes
+name: publish-testing
+node_selector:
+  youyao/project-hostrole: testing
 
-steps:    # 定义管道的执行步骤
-  - name: clone-test
-    image: alpine/git
+steps:
+  - name: build
+    image: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:latest
     commands:
-      - git version
-      - pwd
-      - ls -a
+      - "composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/"
+      - "composer install -v"
+  - name: deploy-push-images
+    image: plugins/docker
+    settings:
+      repo: uhub.service.ucloud.cn/yydocker_testing/core
+      registry: uhub.service.ucloud.cn
+      username:
+        from_secret: aliyun_docker_name
+      password:
+        from_secret: aliyun_docker_password
+      dockerfile: docker/Dockerfile
+      tags: latest
+  - name: deploy
+    image: uhub.service.ucloud.cn/drone/ssh
+    settings:
+      host: "app01-003"
+      username:
+        from_secret: ssh_username
+      key:
+        from_secret: ssh_key
+      script:
+        - "kubectl -n testing rollout restart deployment core"
+trigger:
+  branch:
+    - develop
+  event:
+    - push
+image_pull_secrets:
+  - docker_secret
 
-trigger:                # 触发条件
-    branch:             # git 分支
-      - develop
-  event:                # 事件
-    - push              # 当推送时触发
+---
+kind: pipeline
+type: kubernetes
+name: publish-staging
+node_selector:
+  youyao/deployment-node: default
+
+steps:
+  - name: build
+    image: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:latest
+    commands:
+      - "composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/"
+      - "composer install -v"
+  - name: deploy-push-images
+    image: plugins/docker
+    settings:
+      repo: uhub.service.ucloud.cn/yydocker_staging/core
+      registry: uhub.service.ucloud.cn
+      username:
+        from_secret: yy_docker_username
+      password:
+        from_secret: yy_docker_password
+      dockerfile: docker/Dockerfile
+      tags: latest
+  - name: deploy-pull-images
+    image: uhub.service.ucloud.cn/drone/ssh
+    settings:
+      host: "kubectl-server"
+      username:
+        from_secret: ssh_username
+      key:
+        from_secret: ssh_key
+      script:
+        - "kubectl -n staging rollout restart deployment core"
+trigger:
+  branch:
+    - release
+  event:
+    - push
+image_pull_secrets:
+  - docker_secret
+
+---
+kind: pipeline
+type: kubernetes
+name: publish-prod
+node_selector:
+  youyao/deployment-node: default
+
+steps:
+  - name: build
+    image: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:latest
+    commands:
+      - "composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/"
+      - "composer install -v"
+
+  - name: deploy
+    image: plugins/docker
+    settings:
+      repo: uhub.service.ucloud.cn/yydocker_prod/service-core
+      registry: uhub.service.ucloud.cn
+      auto_tag: true
+      username:
+        from_secret: yy_docker_username
+      password:
+        from_secret: yy_docker_password
+      dockerfile: docker/Dockerfile
+
+trigger:
+  event:
+    - tag
+image_pull_secrets:
+  - docker_secret

.env

@@ -5,7 +5,7 @@ APP_ENV=dev
 DB_DRIVER=mysql
 DB_HOST=106.15.233.223
 DB_PORT=13306
-DB_DATABASE=gitea
+DB_DATABASE=ghyperf-admin
 DB_USERNAME=root
 DB_PASSWORD=root
 DB_CHARSET=utf8mb4

docker/Dockerfile

@@ -1,15 +1,5 @@
-FROM gong921123/debian-nginx-php114-74:latest
-# 复制当前目录的所有 到上面容器的 var/www中去，变成一个新的镜像
-# 要想复制其他文件 就必须把dockerfile和其他文件放一起
-# 这里复制了这个项目的所有
+FROM registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:latest
 
 COPY . /var/www
 
-# CMD不同于RUN，CMD用于指定在容器启动时所要执行的命令，而RUN用于指定镜像构建时所要执行的命令
-# CMD只运行出现一次 多次出现只会执行最后一个
-# 启动 hyperf 框架 并且 启动Nginx 服务器
-CMD ["php", "bin/hyperf.php", "start"]
-#CMD ["nginx"]
-#CMD php bin/hyperf.php start && nginx -g 'daemon off;'
-#CMD php bin/hyperf.php start && nginx
-# nginx -g 'daemon off;' 它将以前台模式运行，并将日志输出到终端
+RUN php bin/hyperf.php