diff --git a/.drone.yml b/.drone.yml index 9da843c..e9a17ee 100755 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: image: plugins/docker pull: if-not-exists settings: - repo: gong921123/hyperf-2 + repo: gong921123/hyperfa registry: docker.io insecure: true username: @@ -42,12 +42,12 @@ steps: port: 22 script: - echo ====开始部署======= - - docker pull gong921123/hyperf-2:${DRONE_TAG} - - docker stop $(docker ps | grep gong921123/hyperf | awk '{print $3}') - - docker rm $(docker ps | grep gong921123/hyperf | awk '{print $3}') + - 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 "" | 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-2:${DRONE_TAG} + - 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/hyperfa:${DRONE_TAG} - echo ====部署成功======= trigger: diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ca6e6c..b916dba 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,4 +9,6 @@ COPY . /var/www # CMD只运行出现一次 多次出现只会执行最后一个 # 启动 hyperf 框架 并且 启动Nginx 服务器 #CMD ["php", "bin/hyperf.php", "start"] -CMD php bin/hyperf.php start && nginx -g 'daemon off;' +#CMD php bin/hyperf.php start && nginx -g 'daemon off;' +CMD php bin/hyperf.php start && nginx +# nginx -g 'daemon off;' 它将以前台模式运行,并将日志输出到终端