diff --git a/distros/src/Dockerfile.apk-alpine b/distros/src/Dockerfile.apk-alpine index a029738..582c2c4 100644 --- a/distros/src/Dockerfile.apk-alpine +++ b/distros/src/Dockerfile.apk-alpine @@ -25,15 +25,6 @@ FROM alpine:${VER} ARG TARGETPLATFORM ARG TYPE=core ARG VER=3.19 -# Set multiple labels at once, author,builtdate -LABEL \ - github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ - github.com.infrastlabs.docker-x11base.release="production" \ - github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ - github.com.infrastlabs.docker-x11base.maintainer="sam " \ - github.com.infrastlabs.docker-x11base.builtdate="$(date -u +'%Y-%m-%d %H:%M:%S')" - - # https://www.jakehu.me/2021/alpine-mirrors/ # mirrors.tuna.tsinghua.edu.cn mirrors.ustc.edu.cn mirrors.aliyun.com # v3.0, v3.1, v3.2: 3.0-noneImg; v2.7:withImg,withoutRepo; @@ -232,4 +223,13 @@ EXPOSE 10089/tcp 10081/tcp 10022/tcp CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ - SHELL=/bin/bash \ No newline at end of file + SHELL=/bin/bash + +# Set multiple labels at once, author,builtdate +ARG BUILDDATE +LABEL \ + github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ + github.com.infrastlabs.docker-x11base.release="production" \ + github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ + github.com.infrastlabs.docker-x11base.maintainer="sam " \ + github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE" diff --git a/distros/src/Dockerfile.apt-ubuntu b/distros/src/Dockerfile.apt-ubuntu index f5601ac..b78a3c2 100644 --- a/distros/src/Dockerfile.apt-ubuntu +++ b/distros/src/Dockerfile.apt-ubuntu @@ -7,14 +7,6 @@ FROM ubuntu:${VER} ARG TARGETPLATFORM ARG TYPE=core ARG VER=20.04 -# Set multiple labels at once, author,builtdate -LABEL \ - github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ - github.com.infrastlabs.docker-x11base.release="production" \ - github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ - github.com.infrastlabs.docker-x11base.maintainer="sam " \ - github.com.infrastlabs.docker-x11base.builtdate="$(date -u +'%Y-%m-%d %H:%M:%S')" - ENV \ DEBIAN_FRONTEND=noninteractive \ LOCALE_INCLUDE="zh_CN zh_HK zh_TW en en_AU fr fr_CA pt pt_BR es ar cs de it ru nl tr is sv uk ja ko th vi" @@ -297,3 +289,12 @@ ENV \ # 默认约定 # L="zh_CN" \ # TZ="Asia/Shanghai" + +# Set multiple labels at once, author,builtdate +ARG BUILDDATE +LABEL \ + github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ + github.com.infrastlabs.docker-x11base.release="production" \ + github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ + github.com.infrastlabs.docker-x11base.maintainer="sam " \ + github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE" diff --git a/distros/src/Dockerfile.zyp-opensuse b/distros/src/Dockerfile.zyp-opensuse index 10e7fd4..a9d7a73 100644 --- a/distros/src/Dockerfile.zyp-opensuse +++ b/distros/src/Dockerfile.zyp-opensuse @@ -27,14 +27,6 @@ FROM opensuse/leap:${VER} ARG TARGETPLATFORM ARG TYPE=core ARG VER=15.5 -# Set multiple labels at once, author,builtdate -LABEL \ - github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ - github.com.infrastlabs.docker-x11base.release="production" \ - github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ - github.com.infrastlabs.docker-x11base.maintainer="sam " \ - github.com.infrastlabs.docker-x11base.builtdate="$(date -u +'%Y-%m-%d %H:%M:%S')" - # zyp-source # http://mirrors.ustc.edu.cn/help/opensuse.html # https://blog.csdn.net/zhuzhenyu215/article/details/133523918 @@ -152,4 +144,13 @@ EXPOSE 10089/tcp 10081/tcp 10022/tcp CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ - SHELL=/bin/bash \ No newline at end of file + SHELL=/bin/bash + +# Set multiple labels at once, author,builtdate +ARG BUILDDATE +LABEL \ + github.com.infrastlabs.docker-x11base.vendor=Infrastlabs \ + github.com.infrastlabs.docker-x11base.release="production" \ + github.com.infrastlabs.docker-x11base.version="1.0.1-beta" \ + github.com.infrastlabs.docker-x11base.maintainer="sam " \ + github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"