From 892eacac3d3e199654785bf5b73481d1d9c71bee Mon Sep 17 00:00:00 2001 From: mie Date: Thu, 18 Jul 2024 11:19:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=AE=9A=E5=88=B6=E5=8C=96=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 28 ++++++++++++++++++++++++---- core/settings.py | 2 +- version.py | 1 + 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 version.py diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6747df606..45695ce08 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -5,6 +5,8 @@ on: push: branches: - master + paths: + - version.py jobs: buildx: @@ -28,12 +30,24 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- - + - name: Release version + id: release_version + run: | + app_version=$(cat version.py |sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp") + echo "app_version=$app_version" >> $GITHUB_ENV + - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.HUB_DOCKER_USERNAME }} + password: ${{ secrets.HUB_DOCKER_PASSWORD }} + + - name: Login to Aliyun + uses: docker/login-action@v2 + with: + registry: registry.cn-hangzhou.aliyuncs.com + username: ${{ secrets.ALIYUN_DOCKER_USERNAME }} + password: ${{ secrets.ALIYUN_DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v4 @@ -41,7 +55,13 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - tags: ${{ secrets.DOCKER_USERNAME }}/filecodebox:beta + build-args: | + FILECODEBOX_VERSION=${{ env.app_version }} + tags: | + ${{ secrets.HUB_DOCKER_USERNAME }}/filecodebox:${{ env.app_version }} + ${{ secrets.HUB_DOCKER_USERNAME }}/filecodebox:latest + registry.cn-hangzhou.aliyuncs.com/${{ secrets.HUB_DOCKER_USERNAME }}/filecodebox:${{ env.app_version }} + registry.cn-hangzhou.aliyuncs.com/${{ secrets.HUB_DOCKER_USERNAME }}/filecodebox:latest cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max diff --git a/core/settings.py b/core/settings.py index ee516b2b5..628d0b64e 100644 --- a/core/settings.py +++ b/core/settings.py @@ -42,7 +42,7 @@ 'uploadMinute': 1, 'opacity': 0.9, 'background': '', - 'uploadCount': 10, + 'uploadCount': 1000, 'errorMinute': 1, 'errorCount': 1, 'port': 12345, diff --git a/version.py b/version.py new file mode 100644 index 000000000..e96350aa3 --- /dev/null +++ b/version.py @@ -0,0 +1 @@ +APP_VERSION = 'v2.1' \ No newline at end of file From 005425d6fbb3e8ea21ef865b08164e01e44477fc Mon Sep 17 00:00:00 2001 From: miraclemie <47073793+miraclemie@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:21:05 +0800 Subject: [PATCH 2/3] Update version.py --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index e96350aa3..b21482440 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -APP_VERSION = 'v2.1' \ No newline at end of file +APP_VERSION = 'v2.1' From 8e81cc507800ab024478de0fd605c705cf6fe118 Mon Sep 17 00:00:00 2001 From: miraclemie <47073793+miraclemie@users.noreply.github.com> Date: Fri, 19 Jul 2024 10:02:11 +0800 Subject: [PATCH 3/3] Update settings.py --- core/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/settings.py b/core/settings.py index 628d0b64e..ee516b2b5 100644 --- a/core/settings.py +++ b/core/settings.py @@ -42,7 +42,7 @@ 'uploadMinute': 1, 'opacity': 0.9, 'background': '', - 'uploadCount': 1000, + 'uploadCount': 10, 'errorMinute': 1, 'errorCount': 1, 'port': 12345,