diff --git a/.drone.yml b/.drone.yml index dfb59aa..ac12ccc 100755 --- a/.drone.yml +++ b/.drone.yml @@ -16,25 +16,25 @@ steps: # 定义管道的执行步骤 # - ls -a # ****************** 直接丢掉 默认会直接拉代码 ****************** -# - name: build # 步骤名称 -# image: gong921123/debian-nginx-php114-74:latest # 当前步骤使用的镜像 image: composer:latest 这里还是使用自己的环境 否则可能一些依赖版本问题会出现,这里的composer是 2.5.4 版本 -# commands: # 当前步骤执行的命令 -## - composer -v -## - ls -a -## - composer install -v + - name: build # 步骤名称 + image: gong921123/debian-nginx-php114-74:latest # 当前步骤使用的镜像 image: composer:latest 这里还是使用自己的环境 否则可能一些依赖版本问题会出现,这里的composer是 2.5.4 版本 + commands: # 当前步骤执行的命令 +# - composer -v # - ls -a -# - name: deploy-push-images -# image: plugins/docker -# settings: -# repo: gong921123/hyperf # 推送到dockerhub仓库去 -# registry: docker.io -# insecure: true # 不使用https -# username: -# from_secret: docker_username -# password: -# from_secret: docker_password -# dockerfile: docker/Dockerfile -# tags: latest +# - composer install -v + - ls -a + - name: deploy-push-images + image: plugins/docker + settings: + repo: gong921123/hyperf # 推送到dockerhub仓库去 + registry: docker.io + insecure: true # 不使用https + username: + from_secret: docker_username + password: + from_secret: docker_password + dockerfile: docker/Dockerfile + tags: latest - name: deploy-pull-project @@ -56,8 +56,8 @@ steps: # 定义管道的执行步骤 # - docker rmi $(docker images | grep "" | awk '{print $3}') - 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 +# - cd var/www +# - php bin/hyperf.php start - echo ====部署成功======= diff --git a/docker/Dockerfile b/docker/Dockerfile index f9cce17..8a534f7 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,3 +4,5 @@ FROM gong921123/debian-nginx-php114-74:latest # 这里复制了这个项目的所有 # test COPY . /var/www + +ENTRYPOINT ["php", "/opt/www/bin/hyperf.php", "start"]