From d0c2083a0ec95bcad85d99f407f410d255bd1cb1 Mon Sep 17 00:00:00 2001
From: Gong <534592533@qq.com>
Date: Tue, 29 Aug 2023 16:41:03 +0800
Subject: [PATCH] fix: YML

---
 .drone.yml | 8 ++++----
 Dockerfile | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 12a1b62..e55e65b 100755
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,7 +29,7 @@ steps: # 定义管道的执行步骤
         - build
       image: plugins/docker
       settings:
-        repo: gong921123/hyperf2              # 推送到dockerhub仓库去
+        repo: gong921123/hyperf              # 推送到dockerhub仓库去
         registry: docker.io
         insecure: true                                 # 不使用https
         username:
@@ -53,11 +53,11 @@ steps: # 定义管道的执行步骤
         port: 22
         script:
           - echo ====开始部署=======
-          - docker pull gong921123/hyperf2:latest
+  #        - 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 hyperf2  -p 8001:80 -v /usr/local/var/www/hyperf:/var/www -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true gong921123/hyperf2:latest
-          - docker exec -it hyperf2 /bin/bash
+          - docker run -itd --name hyperf  -p 8001:80 -v /usr/local/var/www/hyperf:/var/www -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 ====部署成功=======
diff --git a/Dockerfile b/Dockerfile
index 1f54b01..21174bd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@ FROM gong921123/debian-nginx-php114-74:latest
 # 复制当前目录的所有 到上面容器的 var/www中去，变成一个新的镜像
 # 要想复制其他文件 就必须把dockerfile和其他文件放一起
 # 这里复制了这个项目的所有
-# test
-COPY . /var/www
-
 WORKDIR /var/www
 
+COPY . /var/www
+
+
 CMD ["php", "bin/hyperf.php", "start"]