diff --git a/.github/workflows/1panel-appstore.yml b/.github/workflows/1panel-appstore.yml index dd40977b4..cfd67dd0e 100644 --- a/.github/workflows/1panel-appstore.yml +++ b/.github/workflows/1panel-appstore.yml @@ -30,12 +30,12 @@ jobs: APP_DIR="apps/dbx" mkdir -p "${APP_DIR}/latest" - cp "${{ github.workspace }}/1panel/data.yml" "${APP_DIR}/data.yml" - cp "${{ github.workspace }}/1panel/README.md" "${APP_DIR}/README.md" - if [ -f "${{ github.workspace }}/1panel/logo.png" ]; then - cp "${{ github.workspace }}/1panel/logo.png" "${APP_DIR}/logo.png" + cp "${{ github.workspace }}/deploy/1panel/data.yml" "${APP_DIR}/data.yml" + cp "${{ github.workspace }}/deploy/1panel/README.md" "${APP_DIR}/README.md" + if [ -f "${{ github.workspace }}/deploy/1panel/logo.png" ]; then + cp "${{ github.workspace }}/deploy/1panel/logo.png" "${APP_DIR}/logo.png" fi - cp -r "${{ github.workspace }}/1panel/latest/." "${APP_DIR}/latest/" + cp -r "${{ github.workspace }}/deploy/1panel/latest/." "${APP_DIR}/latest/" git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml index fd1840cae..0b93fc5bd 100644 --- a/.github/workflows/docker-dev.yml +++ b/.github/workflows/docker-dev.yml @@ -30,6 +30,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: deploy/Dockerfile platforms: ${{ matrix.platform }} outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/dbx,push-by-digest=true,name-canonical=true,push=true cache-from: type=gha,scope=${{ matrix.platform }}-dev diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7bae6dc9..9dcff5eee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -228,6 +228,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: deploy/Dockerfile platforms: ${{ matrix.platform }} outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/dbx,push-by-digest=true,name-canonical=true,push=true cache-from: type=gha,scope=${{ matrix.platform }} diff --git a/README.md b/README.md index ba9d6d702..c3348f270 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ DBX provides a web version that can be deployed via Docker. docker run -d --name dbx -p 4224:4224 -v dbx-data:/app/data t8y2/dbx ``` -Or with Docker Compose: +Or with Docker Compose. A ready-to-use example lives at `deploy/docker-compose.yml`: ```yaml services: diff --git a/README.zh-CN.md b/README.zh-CN.md index f306e6690..b63103f0f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -160,7 +160,7 @@ DBX 提供 Web 版本,可通过 Docker 部署。 docker run -d --name dbx -p 4224:4224 -v dbx-data:/app/data t8y2/dbx ``` -或使用 Docker Compose: +或使用 Docker Compose,示例文件位于 `deploy/docker-compose.yml`: ```yaml services: diff --git a/1panel/README.md b/deploy/1panel/README.md similarity index 100% rename from 1panel/README.md rename to deploy/1panel/README.md diff --git a/1panel/data.yml b/deploy/1panel/data.yml similarity index 100% rename from 1panel/data.yml rename to deploy/1panel/data.yml diff --git a/1panel/latest/data.yml b/deploy/1panel/latest/data.yml similarity index 100% rename from 1panel/latest/data.yml rename to deploy/1panel/latest/data.yml diff --git a/1panel/latest/docker-compose.yml b/deploy/1panel/latest/docker-compose.yml similarity index 100% rename from 1panel/latest/docker-compose.yml rename to deploy/1panel/latest/docker-compose.yml diff --git a/1panel/logo.png b/deploy/1panel/logo.png similarity index 100% rename from 1panel/logo.png rename to deploy/1panel/logo.png diff --git a/Dockerfile b/deploy/Dockerfile similarity index 100% rename from Dockerfile rename to deploy/Dockerfile diff --git a/.dockerignore b/deploy/Dockerfile.dockerignore similarity index 100% rename from .dockerignore rename to deploy/Dockerfile.dockerignore diff --git a/docker-compose.yml b/deploy/docker-compose.yml similarity index 74% rename from docker-compose.yml rename to deploy/docker-compose.yml index a56d9afb8..5177c644c 100644 --- a/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -1,6 +1,8 @@ services: dbx: - build: . + build: + context: .. + dockerfile: deploy/Dockerfile ports: - "4224:4224" environment: