From e02fbbcebc0c570366ff50bbd82106ab2894961b Mon Sep 17 00:00:00 2001
From: Gong <534592533@qq.com>
Date: Tue, 29 Aug 2023 19:06:28 +0800
Subject: [PATCH] fix: yml

---
 .drone.yml        | 64 +++++++++++++++++------------------------------
 docker/Dockerfile |  7 ++++--
 2 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1a820c8..3475211 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,16 +19,16 @@ steps: # 定义管道的执行步骤
     - name: build # 步骤名称
       image: gong921123/debian-nginx-php114-74:latest # 当前步骤使用的镜像 image: composer:latest 这里还是使用自己的环境 否则可能一些依赖版本问题会出现，这里的composer是 2.5.4 版本
       commands: # 当前步骤执行的命令
-      - composer -v
+#      - composer -v
       - ls -a
-      - composer install -v
+#      - composer install -v
 
     - name: deploy-push-images
       depends_on: # 依赖build管道
         - build
       image: plugins/docker
       settings:
-        repo: gong921123/hyperf              # 推送到dockerhub仓库去
+        repo: gong921123/hyperf2              # 推送到dockerhub仓库去
         registry: docker.io
         insecure: true                                 # 不使用https
         username:
@@ -36,45 +36,27 @@ steps: # 定义管道的执行步骤
         password:
           from_secret: docker_password
         dockerfile: docker/Dockerfile
-        tags: latest
-
-    - name: deploy-pull-project
-      depends_on:
-        - deploy-push-images
-      image: appleboy/drone-ssh
-      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 "<none>" | 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
-#          - docker exec -it gong921123/hyperf /bin/bash
-  #        - cd var/www
-  #        - php bin/hyperf.php start
-          - echo ====部署成功=======
-
-
-#  docker run -itd --name gong921123/hyperf  -p 8882:80 -v /usr/local/var/www/hyperf:/code -v
-#  /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true  gong921123/hyperf:latest
-
-#    - name: start_container
-#      image: docker
-#      commands:
-#        - docker-compose up -d
-#
-#    - name: run_hyperf
-#      image: docker
-#      commands:
-#        - docker-compose exec -T gong921123/hyperf:latest php bin/hyperf.php
+        tags: ${DRONE_TAG}
 
+#    - name: deploy-pull-project
+#      depends_on:
+#        - deploy-push-images
+#      image: appleboy/drone-ssh
+#      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 "<none>" | 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 ====部署成功=======
 trigger:                # 触发条件，并关系
   branch:               # git 分支
       - develop
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 642ba8c..8ca6e6c 100755
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,5 +5,8 @@ FROM gong921123/debian-nginx-php114-74:latest
 
 COPY . /var/www
 
-
-CMD ["php", "bin/hyperf.php", "start"]
+# CMD不同于RUN，CMD用于指定在容器启动时所要执行的命令，而RUN用于指定镜像构建时所要执行的命令
+# CMD只运行出现一次 多次出现只会执行最后一个
+# 启动 hyperf 框架 并且 启动Nginx 服务器
+#CMD ["php", "bin/hyperf.php", "start"]
+CMD php bin/hyperf.php start && nginx -g 'daemon off;'