From 63edc377ca2f185ac6ccd0331a1002b31e7943da Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 3 Jun 2021 09:49:54 +0800 Subject: [PATCH] update --- .drone.yml | 2 +- Dockerfile | 4 ++-- docker-compose.yml | 16 ++++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index f7b33d0..ea7240d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: - composer -v - composer config repo.packagist composer https://mirrors.aliyun.com/composer/ - composer install - - ls + - cp .env.example .env - ls vendor - name: publish image: plugins/docker:19.03.8 diff --git a/Dockerfile b/Dockerfile index 3111550..6c0e79b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM php:8.0.6-fpm-alpine3.13 -COPY . /www -CMD [ "php artisan serve --host 0.0.0.0" ] +COPY . /var/www/html +ENTRYPOINT [ "php","artisan", "serve", "--host 0.0.0.0" ] diff --git a/docker-compose.yml b/docker-compose.yml index 6dc1829..4816afa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,14 @@ services: # volumes: # - ./:/app # command: bash -c "composer config repo.packagist composer https://mirrors.aliyun.com/composer/&&composer update" - php: - image: php:8.0.6-fpm-alpine3.13 + # php: + # image: php:8.0.6-fpm-alpine3.13 + # ports: + # - 8080:8000 + # volumes: + # - ./:/var/www/html + # command: php artisan serve --host 0.0.0.0 + dev: + build: . ports: - - 8080:8000 - volumes: - - ./:/www - command: "php artisan serve --host 0.0.0.0 --port 8080" + - 8080:8000