diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 367cea34..8a7b6cff 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -78,11 +78,16 @@ RUN apt-get -o Acquire::Retries=3 update \ ARG VCS_REF=unknown ARG BUILD_DATE=unknown +ARG APP_VERSION=3.1.15 LABEL com.caiwu.project="CaiWuXiTong" \ org.opencontainers.image.revision="$VCS_REF" \ org.opencontainers.image.created="$BUILD_DATE" +ENV CAIWU_APP_VERSION="$APP_VERSION" \ + CAIWU_BUILD_COMMIT="$VCS_REF" \ + CAIWU_BUILD_TIME="$BUILD_DATE" + WORKDIR /var/www/html COPY --from=vendor /build/vendor /var/www/html/vendor diff --git a/resources/views/components/layouts/admin/footer.blade.php b/resources/views/components/layouts/admin/footer.blade.php index e4ead882..ee074e40 100644 --- a/resources/views/components/layouts/admin/footer.blade.php +++ b/resources/views/components/layouts/admin/footer.blade.php @@ -1,2 +1,5 @@ @stack('footer_start') +
+ 版本 {{ env('CAIWU_APP_VERSION', 'unknown') }} · commit {{ substr((string) env('CAIWU_BUILD_COMMIT', 'unknown'), 0, 12) }} · 构建 {{ env('CAIWU_BUILD_TIME', 'unknown') }} +
@stack('footer_end') diff --git a/scripts/deploy-from-workstation.ps1 b/scripts/deploy-from-workstation.ps1 index 5e20cbf3..270440f9 100644 --- a/scripts/deploy-from-workstation.ps1 +++ b/scripts/deploy-from-workstation.ps1 @@ -378,6 +378,7 @@ try { --build-context 'frontend=.caiwu-build/public' ` --build-arg "VCS_REF=$deploySha" ` --build-arg "BUILD_DATE=$buildDate" ` + --build-arg 'APP_VERSION=3.1.15' ` --label 'com.caiwu.project=CaiWuXiTong' ` --file deploy/Dockerfile ` . @@ -502,6 +503,7 @@ try { --build-context 'frontend=.caiwu-build/public' ` --build-arg "VCS_REF=$deploySha" ` --build-arg "BUILD_DATE=$buildDate" ` + --build-arg 'APP_VERSION=3.1.15' ` --label 'com.caiwu.project=CaiWuXiTong' ` --file deploy/Dockerfile ` .