diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 7a6f51de8..b2a397e10 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -60,7 +60,8 @@ jobs: else DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" fi - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \ + echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ + --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \ ${DOCKER_IMAGE_TAGS} . - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -115,9 +116,9 @@ jobs: else DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" fi - echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \ + echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ + --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \ ${DOCKER_IMAGE_TAGS} . - env - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx diff --git a/installer/Dockerfile b/installer/Dockerfile index d20666010..86a23b84e 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -8,6 +8,10 @@ RUN cd ui && \ rm -rf ./node_modules FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3 +ARG DOCKER_IMAGE_TAG=dev +ARG BUILD_AT +ARG GITHUB_COMMIT +ENV MAXKB_VERSION ${DOCKER_IMAGE_TAG} (build at ${BUILD_AT}, commit: ${GITHUB_COMMIT}) # 创建工作目录 RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf # 拷贝项目 diff --git a/ui/src/api/user.ts b/ui/src/api/user.ts index 3dbe9211f..e11d70168 100644 --- a/ui/src/api/user.ts +++ b/ui/src/api/user.ts @@ -124,6 +124,13 @@ const getUserList: (email_or_username: string, loading?: Ref) => Promis return get('/user/list', { email_or_username }, loading) } +/** + * 获取version + */ +const getVersion: (loading?: Ref) => Promise> = (loading) => { + return get('/profile', undefined, loading) +} + export default { login, register, @@ -134,5 +141,6 @@ export default { sendEmailToCurrent, resetCurrentUserPassword, logout, - getUserList + getUserList, + getVersion } diff --git a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue index 6f15aba8d..f72ecab63 100644 --- a/ui/src/layout/components/top-bar/avatar/AboutDialog.vue +++ b/ui/src/layout/components/top-bar/avatar/AboutDialog.vue @@ -31,30 +31,18 @@ 论坛求助 -
当前版本号:{{ PackageJSON.version }}
- +
版本号:{{ version }}