diff --git a/Dockerfile b/Dockerfile index f6c553c..148693a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,28 @@ -# Ver: 1.10 by Endial Fang (endial@126.com) +# Ver: 1.11 by Endial Fang (endial@126.com) # # 系统默认变量 ==================================================================== # 该部分变量为系统根据编译命令默认设置 -# `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=dbuilder # 设置当前应用名称 -ARG APP_VER=12 # 设置当前应用版本 -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=dBuilder +ARG APP_VER=12 +ARG REGISTRY_URL="swr.cn-north-4.myhuaweicloud.com/colovu/" +ARG APT_SOURCE=aliyun +ARG LOCAL_URL="http://pkgs.colovu.com/dist" # 1. 生成镜像 ===================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/debian:${APP_VER} +FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}debian:${APP_VER} # 声明需要使用的全局可变参数（ARG声明的变量仅编译打包阶段有效） ARG APP_NAME @@ -32,7 +32,7 @@ ARG APT_SOURCE LABEL \ "Version"="v${APP_VER}" \ "Description"="Docker image for Builder based on Debian." \ - "Github"="https://github.com/colovu/docker-${APP_NAME}" \ + "Github"="https://gitee.com/colovu/docker-${APP_NAME}" \ "Vendor"="Endial Fang (endial@126.com)" # 以下命令安装的软件包 diff --git a/README.md b/README.md index 0929c2b..dff1ea9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Builder +# dBuilder 预安装常用工具及编译工具的镜像。 @@ -12,11 +12,12 @@ **镜像信息：** * 镜像地址： - - 阿里云: registry.cn-shenzhen.aliyuncs.com/colovu/dbuilder:12 - - Colovu Registry: docker.colovu.com/colovu/dbuilder:12 - - 依赖镜像：colovu/debian:12 + * 华为云: swr.cn-north-4.myhuaweicloud.com/colovu/dBuilder:latest + * Colovu: registry.colovu.com/library/dBuilder:latest + * 依赖镜像：registry.colovu.com/library/debian:12 + swr.cn-north-4.myhuaweicloud.com/colovu/debian:12 -> 后续相关命令行默认使用 Aliyun ACR 镜像服务器做说明 +> 后续相关命令行默认使用华为云 SWR 镜像服务器做说明。 ## TL;DR @@ -24,7 +25,7 @@ Docker 快速启动命令： ```shell # 从 Registry 服务器下载镜像并启动 -$ docker run -it registry.cn-shenzhen.aliyuncs.com/colovu/dbuilder:12 /bin/bash +docker run -it swr.cn-north-4.myhuaweicloud.com/colovu/dbuilder:latest /bin/bash ``` ## 数据卷 @@ -42,7 +43,7 @@ $ docker run -it registry.cn-shenzhen.aliyuncs.com/colovu/dbuilder:12 /bin/bash ```dockerfile # 预编译阶段 =============================== -FROM registry.cn-shenzhen.aliyuncs.com/colovu/dbuilder:12 +FROM swr.cn-north-4.myhuaweicloud.com/colovu/dbuilder:latest WORKDIR /tmp @@ -65,7 +66,7 @@ CMD [] ```dockerfile # 预编译阶段。命名为`builder` ================== -FROM registry.cn-shenzhen.aliyuncs.com/colovu/dbuilder:12 as builder +FROM swr.cn-north-4.myhuaweicloud.com/colovu/dbuilder:latest as builder WORKDIR /tmp @@ -92,4 +93,4 @@ CMD [] ---- -本文原始来源 [Endial Fang](https://github.com/colovu) @ [Github.com](https://github.com) +本文原始来源 [Endial Fang](https://gitee.com/colovu) @ [Gitee.com](https://gitee.com) diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..5816448 --- /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="dbuilder" +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