From 42f8568343527963e8f4287b24d867aa502cc96e Mon Sep 17 00:00:00 2001 From: sam#gemmi-win10 Date: Wed, 25 Sep 2024 19:51:22 +0800 Subject: [PATCH] dist: oth x4, +LABEL --- distros/src/oth/Dockerfile._no-busybox | 9 +++++++-- distros/src/oth/Dockerfile.apt-debian | 7 +++++++ distros/src/oth/Dockerfile.opk-openwrt | 9 ++++++++- distros/src/oth/Dockerfile.yum-fedora | 7 +++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/distros/src/oth/Dockerfile._no-busybox b/distros/src/oth/Dockerfile._no-busybox index f5f3b388..00569690 100644 --- a/distros/src/oth/Dockerfile._no-busybox +++ b/distros/src/oth/Dockerfile._no-busybox @@ -2,8 +2,13 @@ ARG REPO= ARG VER=1.36.1 FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs FROM busybox:${VER} -MAINTAINER sam - +# 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')" # # sed grep gawk bash; curl wget # RUN apk add --no-cache \ diff --git a/distros/src/oth/Dockerfile.apt-debian b/distros/src/oth/Dockerfile.apt-debian index 03f2565b..b2e34074 100644 --- a/distros/src/oth/Dockerfile.apt-debian +++ b/distros/src/oth/Dockerfile.apt-debian @@ -3,6 +3,13 @@ ARG VER=12 FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs # ref headless//br-deb12 #29.15M @23.10.14 FROM debian:${VER}-slim +# 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" diff --git a/distros/src/oth/Dockerfile.opk-openwrt b/distros/src/oth/Dockerfile.opk-openwrt index acaf1015..eeae86d4 100644 --- a/distros/src/oth/Dockerfile.opk-openwrt +++ b/distros/src/oth/Dockerfile.opk-openwrt @@ -10,7 +10,14 @@ FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs # FROM openwrt/rootfs:armsr-armv7-openwrt-23.05 AS arm ARG TARGETARCH FROM infrastlabs/x11-base:openwrt-rootfs-${TARGETARCH} -MAINTAINER sam +# 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://blog.csdn.net/seaneer/article/details/135011487 # https://mirror.tuna.tsinghua.edu.cn/openwrt/ diff --git a/distros/src/oth/Dockerfile.yum-fedora b/distros/src/oth/Dockerfile.yum-fedora index f4dac2cd..a26f5d95 100644 --- a/distros/src/oth/Dockerfile.yum-fedora +++ b/distros/src/oth/Dockerfile.yum-fedora @@ -2,6 +2,13 @@ ARG REPO= ARG VER=39 FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs FROM fedora:${VER} +# 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')" # su: util-linux; ping: iputils RUN \ # link yum