Skip to content

Commit

Permalink
dist/x3 ARG BUILDDATE
Browse files Browse the repository at this point in the history
  • Loading branch information
sam#gemmi-win10 authored and huapox committed Dec 4, 2024
1 parent ce4e581 commit 6a5d907
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 27 deletions.
20 changes: 10 additions & 10 deletions distros/src/Dockerfile.apk-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
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;
Expand Down Expand Up @@ -232,4 +223,13 @@ EXPOSE 10089/tcp 10081/tcp 10022/tcp
CMD ["bash", "-c", "exec /entry.sh"]
ENV \
TERM=xterm \
SHELL=/bin/bash
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"
17 changes: 9 additions & 8 deletions distros/src/Dockerfile.apt-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[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 @@ -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 <[email protected]>" \
github.com.infrastlabs.docker-x11base.builtdate="$BUILDDATE"
19 changes: 10 additions & 9 deletions distros/src/Dockerfile.zyp-opensuse
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" \
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
Expand Down Expand Up @@ -152,4 +144,13 @@ EXPOSE 10089/tcp 10081/tcp 10022/tcp
CMD ["bash", "-c", "exec /entry.sh"]
ENV \
TERM=xterm \
SHELL=/bin/bash
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 6a5d907

Please sign in to comment.