From 6155737ba56d82d6af87c9bdd6fcb64a2839fded Mon Sep 17 00:00:00 2001 From: xybingbing Date: Sun, 13 Apr 2025 16:12:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tcp=E5=8F=8D=E5=90=91?= =?UTF-8?q?=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + docker/nginx/nginx.conf | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 52bbc977..08ac08f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,5 +38,6 @@ VOLUME [ "/dpanel" ] EXPOSE 443 EXPOSE 80 EXPOSE 8080 +EXPOSE 22 ENTRYPOINT [ "/docker/entrypoint.sh" ] \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 20fe807b..6a88c51c 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -58,4 +58,6 @@ http { include /dpanel/nginx/redirection_host/*.conf; include /dpanel/nginx/dead_host/*.conf; include /dpanel/nginx/temp/*.conf; -} \ No newline at end of file +} + +include /dpanel/nginx/stream/*.conf; From ab3d1bfdb20e013f2c386ee30a15305fc0a85d62 Mon Sep 17 00:00:00 2001 From: xybingbing Date: Sun, 13 Apr 2025 16:42:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 52 +++-------------------------------- docker/nginx/nginx.conf | 1 - 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d38012d3..2c629caa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -116,62 +116,18 @@ jobs: run: | VERSION_TAG=${GITHUB_REF_NAME#v} VERSION_GROUP_TAG=${VERSION_TAG%.*.*} - - docker buildx build \ - -t dpanel/dpanel:lite \ - -t dpanel/dpanel:${VERSION_TAG}-lite \ - -t dpanel/dpanel:${VERSION_GROUP_TAG}-lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:${VERSION_TAG}-lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:${VERSION_GROUP_TAG}-lite \ - --platform linux/arm64,linux/amd64,linux/arm/v7 \ - --build-arg APP_VERSION=${VERSION_TAG} \ - --build-arg APP_FAMILY=ce \ - -f Dockerfile-lite \ - . --push docker buildx build \ -t dpanel/dpanel:latest \ -t dpanel/dpanel:${VERSION_TAG} \ -t dpanel/dpanel:${VERSION_GROUP_TAG} \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:latest \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:${VERSION_TAG} \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:${VERSION_GROUP_TAG} \ - --platform linux/arm64,linux/amd64,linux/arm/v7 \ + -t dpanel:latest \ + -t dpanel:${VERSION_TAG} \ + -t dpanel:${VERSION_GROUP_TAG} \ + --platform linux/arm64,linux/amd64 \ --build-arg APP_VERSION=${VERSION_TAG} \ --build-arg APP_FAMILY=ce \ . --push - - # pe - - docker buildx build \ - -t dpanel/dpanel:pe-lite \ - -t dpanel/dpanel-pe:lite \ - -t dpanel/dpanel-pe:${VERSION_TAG}-lite \ - -t dpanel/dpanel-pe:${VERSION_GROUP_TAG}-lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:pe-lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:${VERSION_TAG}-lite \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:${VERSION_GROUP_TAG}-lite \ - --platform linux/arm64,linux/amd64,linux/arm/v7 \ - --build-arg APP_VERSION=${VERSION_TAG} \ - --build-arg APP_FAMILY=pe \ - -f Dockerfile-lite \ - . --push - - docker buildx build \ - -t dpanel/dpanel:pe-latest \ - -t dpanel/dpanel-pe:latest \ - -t dpanel/dpanel-pe:${VERSION_TAG} \ - -t dpanel/dpanel-pe:${VERSION_GROUP_TAG} \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel:pe-latest \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:latest \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:${VERSION_TAG} \ - -t registry.cn-hangzhou.aliyuncs.com/dpanel/dpanel-pe:${VERSION_GROUP_TAG} \ - --platform linux/arm64,linux/amd64,linux/arm/v7 \ - --build-arg APP_VERSION=${VERSION_TAG} \ - --build-arg APP_FAMILY=pe \ - . --push - name: upload artifact uses: softprops/action-gh-release@v2 diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 6a88c51c..90f1eb4d 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -59,5 +59,4 @@ http { include /dpanel/nginx/dead_host/*.conf; include /dpanel/nginx/temp/*.conf; } - include /dpanel/nginx/stream/*.conf; From e4f78e9483b98cab6069c2cc13257942fd42277c Mon Sep 17 00:00:00 2001 From: xybingbing Date: Sun, 13 Apr 2025 16:46:36 +0800 Subject: [PATCH 3/3] Create docker-image.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 测试 --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 00000000..793d8e0e --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)