diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index cb709c7..005335d 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -135,6 +135,11 @@ jobs: docker compose down || true docker compose up -d --build --remove-orphans + docker compose ps + docker compose exec -T ulthon_admin test -f /var/www/html/vendor/autoload.php + docker compose exec -T ulthon_admin php -r "require '/var/www/html/vendor/autoload.php'; echo 'autoload-ok'.PHP_EOL;" + docker compose logs --tail=80 ulthon_admin + ln -sfn "${RELEASE_DIR}" "${REMOTE_APP_DIR}/current" ls -1dt "${REMOTE_APP_DIR}/releases"/* 2>/dev/null | tail -n +6 | xargs -r rm -rf diff --git a/docker-compose.yaml b/docker-compose.yaml index 8de07f5..91c3d0c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,8 +13,7 @@ services: ports: - "88:80" # HTTP volumes: - - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 - # - ./runtime:/var/www/html/runtime - # - ./public/storage:/var/www/html/public/storage - # - ./public/build:/var/www/html/public/build - # - ./storage:/var/www/html/storage + - ./runtime:/var/www/html/runtime + - ./public/storage:/var/www/html/public/storage + - ./public/build:/var/www/html/public/build + - ./storage:/var/www/html/storage diff --git a/source/stack/base-build/docker-compose.yaml b/source/stack/base-build/docker-compose.yaml index 8de07f5..91c3d0c 100644 --- a/source/stack/base-build/docker-compose.yaml +++ b/source/stack/base-build/docker-compose.yaml @@ -13,8 +13,7 @@ services: ports: - "88:80" # HTTP volumes: - - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 - # - ./runtime:/var/www/html/runtime - # - ./public/storage:/var/www/html/public/storage - # - ./public/build:/var/www/html/public/build - # - ./storage:/var/www/html/storage + - ./runtime:/var/www/html/runtime + - ./public/storage:/var/www/html/public/storage + - ./public/build:/var/www/html/public/build + - ./storage:/var/www/html/storage diff --git a/source/stack/default/.gitea/workflows/build-and-deploy.yml b/source/stack/default/.gitea/workflows/build-and-deploy.yml index cb709c7..005335d 100644 --- a/source/stack/default/.gitea/workflows/build-and-deploy.yml +++ b/source/stack/default/.gitea/workflows/build-and-deploy.yml @@ -135,6 +135,11 @@ jobs: docker compose down || true docker compose up -d --build --remove-orphans + docker compose ps + docker compose exec -T ulthon_admin test -f /var/www/html/vendor/autoload.php + docker compose exec -T ulthon_admin php -r "require '/var/www/html/vendor/autoload.php'; echo 'autoload-ok'.PHP_EOL;" + docker compose logs --tail=80 ulthon_admin + ln -sfn "${RELEASE_DIR}" "${REMOTE_APP_DIR}/current" ls -1dt "${REMOTE_APP_DIR}/releases"/* 2>/dev/null | tail -n +6 | xargs -r rm -rf diff --git a/source/stack/default/docker-compose.yaml b/source/stack/default/docker-compose.yaml index 8de07f5..91c3d0c 100644 --- a/source/stack/default/docker-compose.yaml +++ b/source/stack/default/docker-compose.yaml @@ -13,8 +13,7 @@ services: ports: - "88:80" # HTTP volumes: - - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 - # - ./runtime:/var/www/html/runtime - # - ./public/storage:/var/www/html/public/storage - # - ./public/build:/var/www/html/public/build - # - ./storage:/var/www/html/storage + - ./runtime:/var/www/html/runtime + - ./public/storage:/var/www/html/public/storage + - ./public/build:/var/www/html/public/build + - ./storage:/var/www/html/storage diff --git a/source/stack/full/docker-compose.yaml b/source/stack/full/docker-compose.yaml index 8de07f5..91c3d0c 100644 --- a/source/stack/full/docker-compose.yaml +++ b/source/stack/full/docker-compose.yaml @@ -13,8 +13,7 @@ services: ports: - "88:80" # HTTP volumes: - - ./:/var/www/html # 直接分发代码可以去掉注释并将下面的目录增加注释 - # - ./runtime:/var/www/html/runtime - # - ./public/storage:/var/www/html/public/storage - # - ./public/build:/var/www/html/public/build - # - ./storage:/var/www/html/storage + - ./runtime:/var/www/html/runtime + - ./public/storage:/var/www/html/public/storage + - ./public/build:/var/www/html/public/build + - ./storage:/var/www/html/storage