From 28a823dedcc49b884faf4d4c2bf559adab260573 Mon Sep 17 00:00:00 2001 From: sam#gemmi-win10 Date: Tue, 3 Dec 2024 21:26:55 +0800 Subject: [PATCH] dist/oth x4 ARG BUILDDATE; busybox-bash -- dist/busybox ln -s /usr/local/static/3rd/bin/bash /bin/; \bash /xconf.sh --- distros/src/oth/Dockerfile._no-busybox | 20 ++++++++++---------- distros/src/oth/Dockerfile.apt-debian | 16 +++++++++------- distros/src/oth/Dockerfile.opk-openwrt | 18 +++++++++--------- distros/src/oth/Dockerfile.yum-fedora | 16 +++++++++------- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/distros/src/oth/Dockerfile._no-busybox b/distros/src/oth/Dockerfile._no-busybox index c97b8c1c..2a233b16 100644 --- a/distros/src/oth/Dockerfile._no-busybox +++ b/distros/src/oth/Dockerfile._no-busybox @@ -2,14 +2,6 @@ ARG REPO= ARG VER=1.36.1 FROM ${REPO}infrastlabs/x11-base:rootfs AS rootfs FROM busybox:${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')" - # # sed grep gawk bash; curl wget # RUN apk add --no-cache \ # ca-certificates tzdata curl wget \ @@ -27,11 +19,19 @@ RUN \ COPY --from=rootfs /rootfs/res_ubt_share / COPY --from=rootfs /rootfs/files1 / COPY --from=rootfs /rootfs/files2 / -RUN \ +RUN ln -s /usr/local/static/3rd/bin/bash /bin/; \ bash /xconf.sh core; exit 0 EXPOSE 10089/tcp 10081/tcp 10022/tcp +CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ SHELL=/bin/bash -CMD ["bash", "-c", "exec /entry.sh"] +# 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/oth/Dockerfile.apt-debian b/distros/src/oth/Dockerfile.apt-debian index 3dc4f885..09b2af48 100644 --- a/distros/src/oth/Dockerfile.apt-debian +++ b/distros/src/oth/Dockerfile.apt-debian @@ -3,13 +3,6 @@ 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" @@ -71,3 +64,12 @@ CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ 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/oth/Dockerfile.opk-openwrt b/distros/src/oth/Dockerfile.opk-openwrt index 6806e310..1787ff07 100644 --- a/distros/src/oth/Dockerfile.opk-openwrt +++ b/distros/src/oth/Dockerfile.opk-openwrt @@ -10,15 +10,6 @@ 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} -# 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/ # https://mirror.tuna.tsinghua.edu.cn/openwrt/releases/23.05.3/packages/ @@ -62,3 +53,12 @@ CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ 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/oth/Dockerfile.yum-fedora b/distros/src/oth/Dockerfile.yum-fedora index 7f342b94..aae20616 100644 --- a/distros/src/oth/Dockerfile.yum-fedora +++ b/distros/src/oth/Dockerfile.yum-fedora @@ -2,13 +2,6 @@ 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 @@ -36,3 +29,12 @@ CMD ["bash", "-c", "exec /entry.sh"] ENV \ TERM=xterm \ 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"