refactor(scripts): 优化docker部署脚本逻辑,移除固定镜像ID检查
强制构建新镜像以确保使用最新的Dockerfile配置
This commit is contained in:
parent
86a0cc696a
commit
83f3634d06
|
|
@ -6,23 +6,21 @@ IMAGE="marketing-system-data-tool"
|
||||||
TAG="$ENV_NAME"
|
TAG="$ENV_NAME"
|
||||||
PORT="${PORT:-8077}"
|
PORT="${PORT:-8077}"
|
||||||
cd "$ROOT_DIR"
|
cd "$ROOT_DIR"
|
||||||
FIXED_IMG_ID="254602263cd6"
|
|
||||||
if docker image inspect "$FIXED_IMG_ID" >/dev/null 2>&1; then
|
# 强制构建新镜像,确保使用最新的 Dockerfile
|
||||||
USE_IMAGE="$FIXED_IMG_ID"
|
if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then
|
||||||
else
|
|
||||||
if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then
|
|
||||||
DOCKER_BUILDKIT=1 docker build \
|
DOCKER_BUILDKIT=1 docker build \
|
||||||
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
||||||
--build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
|
--build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
|
||||||
--cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile .
|
--cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile .
|
||||||
else
|
else
|
||||||
DOCKER_BUILDKIT=1 docker build \
|
DOCKER_BUILDKIT=1 docker build \
|
||||||
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
||||||
--build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
|
--build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
|
||||||
-t "$IMAGE:$TAG" -f Dockerfile .
|
-t "$IMAGE:$TAG" -f Dockerfile .
|
||||||
fi
|
|
||||||
USE_IMAGE="$IMAGE:$TAG"
|
|
||||||
fi
|
fi
|
||||||
|
USE_IMAGE="$IMAGE:$TAG"
|
||||||
|
|
||||||
mkdir -p log storage/export
|
mkdir -p log storage/export
|
||||||
CID_NAME="marketing-data-$ENV_NAME"
|
CID_NAME="marketing-data-$ENV_NAME"
|
||||||
RUNNING=$(docker inspect -f '{{.State.Running}}' "$CID_NAME" 2>/dev/null || echo false)
|
RUNNING=$(docker inspect -f '{{.State.Running}}' "$CID_NAME" 2>/dev/null || echo false)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue