From d733f4c87d9ad9fab8365e1eeb6ba3ed1f2123ad Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Wed, 9 Apr 2025 16:32:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=9B=E5=90=AF=E7=94=A8=E5=8D=8E=E4=B8=BA?= =?UTF-8?q?=E4=BA=91=E9=95=9C=E5=83=8F=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 26 ++++++------- Makefile | 12 +++--- build.sh | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 19 deletions(-) create mode 100755 build.sh diff --git a/Dockerfile b/Dockerfile index c437e11..828736e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,28 +3,28 @@ # 系统默认变量 ==================================================================== # 该部分变量为系统根据编译命令默认设置 -# `TARGETPLATFORM`：构建后的目标平台信息。如 `linux/amd64`，`linux/arm/v7`，`windows/amd64` +# `TARGETPLATFORM`：构建后的目标平台信息。如 `linux/amd64`，`linux/arm/v7`，`windows/amd64` # `TARGETOS`：目标平台信息（TARGETPLATFORM）中的操作系统部分，如：`linux`、`windows` # `TARGETARCH`：目标平台信息（TARGETPLATFORM）中的平台架构部分，如：`amd64`、`arm` # `TARGETVARIANT`：目标平台信息（TARGETPLATFORM）中的版本变体部分，如：`v7` # `BUILDPLATFORM`：用于构建的节点平台信息 # `BUILDOS`：用于构建的节点平台信息（BUILDPLATFORM）中的操作系统部分 -# `BUILDARCH`用于构建的节点平台信息（BUILDPLATFORM）中的平台架构部分 -# `BUILDVARIANT`用于构建的节点平台信息（BUILDPLATFORM）中的版本变体部分 +# `BUILDARCH`：用于构建的节点平台信息（BUILDPLATFORM）中的平台架构部分 +# `BUILDVARIANT`：用于构建的节点平台信息（BUILDPLATFORM）中的版本变体部分 # 可变参数 ======================================================================== # 该部分变量，在编译命令中通过 `--build-arg` 传入；如果未设置，则使用下面对应的默认值 -ARG APP_NAME=test # 设置当前应用名称 -ARG APP_VER=1.0.0 # 设置当前应用版本 -ARG REGISTRY_URL="docker.colovu.com/" # 设置默认仓库地址，默认为本地仓库；定义时需要包含末尾的`/` -ARG APT_SOURCE=aliyun # 设置 apt-get 源：default / ustc / aliyun -ARG LOCAL_URL="http://local.colovu.com/dist" # 编译镜像时指定用于加速的本地软件包存储服务器地址 +ARG APP_NAME=test +ARG APP_VER=1.0.0 +ARG REGISTRY_URL="swr.cn-north-4.myhuaweicloud.com/colovu/" +ARG APT_SOURCE=aliyun +ARG LOCAL_URL="http://pkgs.colovu.com/dist" # 0. 预处理 ====================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:12 as builder -#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/openjdk:8 as builder -#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/golang:1.21 as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}dbuilder:12 as builder +#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}openjdk:8 as builder +#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}golang:1.21 as builder # 声明需要使用的全局可变参数 ARG APP_NAME @@ -83,8 +83,8 @@ RUN set -eux; \ >>/usr/local/${APP_NAME}/runDeps; # 1. 生成镜像 ===================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/debian:12 -#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/openjre:8 +FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}debian:12 +#FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}openjre:8 # 声明需要使用的全局可变参数（ARG声明的变量仅编译打包阶段有效） ARG APP_NAME diff --git a/Makefile b/Makefile index 7293c14..3b1e969 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ # 当前 Docker 镜像的编译脚本 # 定义镜像名称 -image_name :=colovu/template +image_name :=template # 定义默认镜像仓库地址 -REGISTRY_URL :=docker.colovu.com +REGISTRY_URL :=swr.cn-north-4.myhuaweicloud.com/colovu/ # 定义系统默认使用的源服务器，包含：default / ustc / aliyun APT_SOURCE :=aliyun @@ -56,12 +56,12 @@ push: @docker tag $(image_name):$(image_tag) swr.cn-north-4.myhuaweicloud.com/colovu/$(image_name):$(image_tag) @docker push swr.cn-north-4.myhuaweicloud.com/colovu/$(image_name):$(image_tag) @echo "Push $(image_name):$(image_tag) to registry.colovu.com" - @docker tag $(image_name):$(image_tag) registry.colovu.com/$(image_name):$(image_tag) - @docker push registry.colovu.com/$(image_name):$(image_tag) + @docker tag $(image_name):$(image_tag) registry.colovu.com/library/$(image_name):$(image_tag) + @docker push registry.colovu.com/library/$(image_name):$(image_tag) @echo "Push $(image_name):latest to Huawei Cloud SWR colovu space" @docker tag $(image_name):latest swr.cn-north-4.myhuaweicloud.com/colovu/$(image_name):latest @docker push swr.cn-north-4.myhuaweicloud.com/colovu/$(image_name):latest @echo "Push $(image_name):latest to registry.colovu.com" - @docker tag $(image_name):latest registry.colovu.com/$(image_name):latest - @docker push registry.colovu.com/$(image_name):latest + @docker tag $(image_name):latest registry.colovu.com/library/$(image_name):latest + @docker push registry.colovu.com/library/$(image_name):latest @echo "Push complete" diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..8373590 --- /dev/null +++ b/build.sh @@ -0,0 +1,110 @@ +#!/bin/bash +# Ver: 1.0 by Endial Fang (endial@126.com) +# +# Docker 镜像构建脚本 (仅linux/amd64) + +IMAGE_NAME="template" +REGISTRY_URL="swr.cn-north-4.myhuaweicloud.com/colovu/" +APT_SOURCE="aliyun" + +# 获取发布版本标签 +get_release_tag() { + if ! git rev-parse --git-dir >/dev/null 2>&1; then + echo "unknown" + elif [ -n "$(git status --porcelain)" ]; then + echo "latest" + else + # 尝试获取最近的git标签 + local tag=$(git describe --tags --abbrev=0 2>/dev/null) + if [ -n "$tag" ]; then + echo "$tag" + else + local branch=$(git rev-parse --abbrev-ref HEAD) + case "$branch" in + master|main) echo "latest" ;; + *) echo "$branch" ;; + esac + fi + fi +} + +# 获取镜像完整TAG +get_image_tag() { + local CURRENT_SUBVERSION + if git rev-parse --git-dir >/dev/null 2>&1; then + if [ -z "$(git status --porcelain)" ]; then + CURRENT_SUBVERSION=$(git rev-parse --short=12 HEAD) + else + CURRENT_SUBVERSION=$(date +%Y%m%d-%H%M%S) + fi + local branch=$(git rev-parse --abbrev-ref HEAD) + branch=$(echo "$branch" | sed -e 's/master/latest/' -e 's/main/latest/') + echo "${branch}-${CURRENT_SUBVERSION}" + else + CURRENT_SUBVERSION=$(date +%Y%m%d-%H%M%S) + echo "latest-${CURRENT_SUBVERSION}" + fi +} + +# 构建amd64架构镜像 +build() { + local TAG=${1:-$(get_image_tag)} + echo "Building image ${IMAGE_NAME}:${TAG} (linux/amd64)" + + podman build --platform linux/amd64 \ + --progress plain --force-rm \ + --build-arg REGISTRY_URL=${REGISTRY_URL} \ + --build-arg APT_SOURCE=${APT_SOURCE} \ + --build-arg LOCAL_URL=http://pkgs.colovu.com/dist \ + -t ${IMAGE_NAME}:${TAG} \ + -t ${IMAGE_NAME}:latest \ + . + + echo "Build complete" +} + +# 推送镜像到colovu仓库 +push_colovu() { + local TAG=${1:-$(get_image_tag)} + echo "Pushing ${IMAGE_NAME}:${TAG} to registry.colovu.com" + + podman tag "${IMAGE_NAME}:${TAG}" "registry.colovu.com/library/${IMAGE_NAME}:${TAG}" + podman push "registry.colovu.com/library/${IMAGE_NAME}:${TAG}" + + podman tag "${IMAGE_NAME}:latest" "registry.colovu.com/library/${IMAGE_NAME}:latest" + podman push "registry.colovu.com/library/${IMAGE_NAME}:latest" +} + +# 推送镜像到华为云仓库 +push_huawei() { + local TAG=${1:-$(get_release_tag)} + echo "Pushing ${IMAGE_NAME}:${TAG} to swr.cn-north-4.myhuaweicloud.com" + + podman tag "${IMAGE_NAME}:${TAG}" "swr.cn-north-4.myhuaweicloud.com/colovu/${IMAGE_NAME}:${TAG}" + podman push "swr.cn-north-4.myhuaweicloud.com/colovu/${IMAGE_NAME}:${TAG}" + + podman tag "${IMAGE_NAME}:latest" "swr.cn-north-4.myhuaweicloud.com/colovu/${IMAGE_NAME}:latest" + podman push "swr.cn-north-4.myhuaweicloud.com/colovu/${IMAGE_NAME}:latest" +} + +# 清理工作空间 +clean() { + echo "Cleaning workspace..." + podman images | grep "${IMAGE_NAME} " | awk '{print $3}' | xargs -L 1 podman rmi -f + podman ps -a | grep "Exited" | awk '{print $1}' | xargs -L 1 podman rm + podman images | grep '' | awk '{print $3}' | xargs -L 1 podman rmi -f +} + +# 主函数中更新使用说明 +main() { + case "$1" in + build) build "$2" ;; # 传递第二个参数作为标签 + clean) clean ;; + push-cv) push_colovu "$2" ;; + push-hw) push_huawei "$2" ;; + push) push_colovu "$2"; push_huawei "$2" ;; + *) echo "Usage: $0 {build [tag]|clean|push-cv [tag]|push-hw [tag]|push [tag]}"; exit 1 ;; + esac +} + +main "$@" \ No newline at end of file