fix: am1

.drone-new.yml

@@ -0,0 +1,57 @@
+kind: pipeline
+type: docker
+name: test
+
+steps:
+  - name: build
+    image: gong921123/debian-nginx-php114-74:latest
+    pull: if-not-exists
+    commands:
+      - composer -v
+      - ls -a
+      - composer install -v
+
+  - name: deploy-push-images
+    depends_on:
+      - build
+    image: plugins/docker
+    pull: if-not-exists
+    settings:
+      repo: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro # 和dockerfile 分开
+      registry: registry.cn-shanghai.aliyuncs.com
+      insecure: true
+      username:
+        from_secret: aliyun_acr_username
+      password:
+        from_secret: aliyun_acr_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: 106.15.233.223
+      user:
+        from_secret: ssh_username
+      password:
+        from_secret: ssh_password
+      command_timeout: 5m
+      port: 22
+      script:
+        - echo ====开始部署=======
+        - docker stop $(docker ps | grep hyperf | awk  '{print $1}')
+        - docker rm $(docker ps -a | grep hyperf | awk  '{print $1}')
+        - docker rmi $(docker images | grep gong92-socl/debian-nginx-php114-74-pro | awk  '{print $3}')
+        - docker pull registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro:${DRONE_TAG}
+        - docker run -itd --name hyperf -p 8001:8001 -v /var/projects:/var/www -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro:${DRONE_TAG}
+        - echo ====部署成功=======
+
+trigger:
+  #    branch:
+  #      - develop
+  event:
+    - tag
+#    - push

.drone-old.yml

@@ -17,7 +17,7 @@ steps:
     image: plugins/docker
     pull: if-not-exists
     settings:
-      repo: gong921123/hyperfa
+      repo: gong921123/hyperfa  # 这个地址明确了镜像最终要被推送并存储到的阿里云容器镜像仓库的具体位置 和下面的tag 构建完整的路径
       registry: docker.io
       insecure: true
       username:
@@ -53,7 +53,7 @@ steps:
 
 trigger:
 
-
+#  docker run -itd --name hyperf  -p 8001:8001 registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:v2
   #  branch:
   #    - develop
   event:

.drone.yml

@@ -17,7 +17,7 @@ steps:
     image: plugins/docker
     pull: if-not-exists
     settings:
-      repo: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74
+      repo: registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro
       registry: registry.cn-shanghai.aliyuncs.com
       insecure: true
       username:
@@ -42,14 +42,13 @@ steps:
       port: 22
       script:
         - echo ====开始部署=======
-        - docker pull registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74:${DRONE_TAG}
+        - docker stop $(docker ps | grep hyperf | awk  '{print $1}')
-#        - if [ $(docker ps -aq | grep debian-nginx-php114-7 | wc -l) -gt 0 ]; then docker stop $(docker ps | grep debian-nginx-php114-7 | awk '{print $1}'); docker rm $(docker ps | grep debian-nginx-php114-7 | awk '{print $1}'); fi
+        - docker rm $(docker ps -a | grep hyperf | awk  '{print $1}')
-#        - if [ $(docker images | grep debian-nginx-php114-7 | wc -l) -gt 0 ]; then docker rmi $(docker images | grep debian-nginx-php114-7 | awk '{print $3}'); fi
+        - docker rmi $(docker images | grep gong92-socl/debian-nginx-php114-74-pro | awk  '{print $3}')
-#        - if [ $(docker images | grep "<none>" | wc -l) -gt 0 ]; then docker rmi $(docker images | grep "<none>" | awk '{print $3}'); fi
+        - docker pull registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro:${DRONE_TAG}
-#        - e:${DRONE_TAG}
+        - docker run -itd --name hyperf -p 8001:8001 -v /var/projects:/var/www -v /usr/local/docker/vloumn_nginx:/etc/nginx/conf.d -v /etc/hosts:/etc/hosts --privileged=true registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74-pro:${DRONE_TAG}
         - echo ====部署成功=======
 
-
 trigger:
   #    branch:
   #      - develop

docker/Dockerfile

@@ -1,10 +1,10 @@
-FROM registry.cn-shanghai.aliyuncs.com/gong92-socl/debian-nginx-php114-74
+FROM registry.cn-shanghai.aliyuncs.com/gong92-socl/hyperf3-php81-alpine-sw:v1
 #FROM gong921123/debian-nginx-php114-74:latest
 # 复制当前目录的所有 到上面容器的 var/www中去，变成一个新的镜像
 # 要想复制其他文件 就必须把dockerfile和其他文件放一起
 # 这里复制了这个项目的所有
-RUN ls -a
+RUN pwd && ls -a
-COPY . /var/www
+COPY . /code
 RUN ls -al /var/www