zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 增加版本号环境变量

Browse Source
This commit is contained in:
liqiang-fit2cloud 2024-03-21 16:39:47 +08:00
parent 598576fedc
commit 0252134d66
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-and-push.yml vendored
View File

@ -60,7 +60,7 @@ jobs:
else else
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
fi fi
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \ echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
${DOCKER_IMAGE_TAGS} . ${DOCKER_IMAGE_TAGS} .
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
@ -115,7 +115,7 @@ jobs:
else else
DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
fi fi
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --no-cache \ echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} --build-arg MAXKB_VERSION="${{ github.event.inputs.dockerImageTag }} (build at $(TZ=Asia/Shanghai date +'%Y-%m-%d %H:%M:%S'))" --no-cache \
${DOCKER_IMAGE_TAGS} . ${DOCKER_IMAGE_TAGS} .
env env
- name: Set up QEMU - name: Set up QEMU

2
installer/Dockerfile
View File

@ -8,6 +8,8 @@ RUN cd ui && \
rm -rf ./node_modules rm -rf ./node_modules
FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3 FROM ghcr.io/1panel-dev/maxkb-python-pg:python3.11.8-pg15.3
ARG MAXKB_VERSION=dev
ENV MAXKB_VERSION=${MAXKB_VERSION}
# 创建工作目录 # 创建工作目录
RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf RUN mkdir -p /opt/maxkb/app && mkdir -p /opt/maxkb/model && mkdir -p /opt/maxkb/conf
# 拷贝项目 # 拷贝项目