Skip to content

Commit

Permalink
dist/oth x4 ARG BUILDDATE; busybox-bash
Browse files Browse the repository at this point in the history
--
dist/busybox ln -s /usr/local/static/3rd/bin/bash /bin/; \bash /xconf.sh
  • Loading branch information
sam#gemmi-win10 authored and huapox committed Dec 4, 2024
1 parent 6a5d907 commit 28a823d
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 33 deletions.
20 changes: 10 additions & 10 deletions distros/src/oth/Dockerfile._no-busybox
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
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 \
Expand All @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"
16 changes: 9 additions & 7 deletions distros/src/oth/Dockerfile.apt-debian
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
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"
Expand Down Expand Up @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"
18 changes: 9 additions & 9 deletions distros/src/oth/Dockerfile.opk-openwrt
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
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/
Expand Down Expand Up @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"
16 changes: 9 additions & 7 deletions distros/src/oth/Dockerfile.yum-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$(date -u +'%Y-%m-%d %H:%M:%S')"
# su: util-linux; ping: iputils
RUN \
# link yum
Expand Down Expand Up @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"

0 comments on commit 28a823d

Please sign in to comment.