mirror of
https://github.com/dockersrc/go
synced 2026-07-14 23:45:58 -04:00
Finish syncing generated Docker template files against upstream templates: remove dead template-files ARGs from the Dockerfile, sync bin-script boilerplate to the current shell/sh template, migrate the non-standard rootfs/etc dir to rootfs/tmp/etc, fix a gitignore bug that silently dropped rootfs/tmp/, correct the README license, and document the go-tools toolchain-stage exception in the runbook. - AI.md: document that language toolchain build stages (e.g. `FROM golang:alpine AS go-tools`) are intentionally exempt from the PULL_URL/GEN_DOCKERFILE_APP_DIR org rule - Dockerfile: remove dead DEFAULT_FILE_DIR/DEFAULT_DATA_DIR/DEFAULT_CONF_DIR/DEFAULT_TEMPLATE_DIR ARGs and their mkdir usage — the template-files directory no longer exists - README.md: fix stale license claim (MIT) to match the actual LICENSE.md (WTFPL) - .gitignore: anchor the tmp/ pattern to /tmp/ so it stops silently swallowing the required rootfs/tmp/ directory - rootfs/etc/profile.d/go.sh -> rootfs/tmp/etc/profile.d/go.sh: migrate the non-standard rootfs/etc dir to the tmp/etc convention (rootfs/root, rootfs/tmp, rootfs/usr are the only valid rootfs root dirs; 03-files.sh copies tmp/etc/* at build time) - rootfs/usr/local/bin/copy, rootfs/usr/local/bin/symlink: sync APPNAME assignment to the current template style and add the missing trap '' EXIT line - rootfs/usr/local/bin/healthcheck: sync APPNAME assignment and add the missing trap '' EXIT line AI.md Dockerfile .gitignore README.md rootfs/etc/profile.d/go.sh rootfs/tmp/ rootfs/usr/local/bin/copy rootfs/usr/local/bin/healthcheck rootfs/usr/local/bin/symlink
This commit is contained in:
+1
-13
@@ -5,10 +5,6 @@ ARG BUILD_DATE="202605292219"
|
||||
ARG LANGUAGE="en_US.UTF-8"
|
||||
ARG TIMEZONE="America/New_York"
|
||||
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||
ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
|
||||
ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
ARG USER="root"
|
||||
@@ -66,10 +62,6 @@ ARG EXPOSE_PORTS
|
||||
ARG BUILD_VERSION
|
||||
ARG IMAGE_VERSION
|
||||
ARG WWW_ROOT_DIR
|
||||
ARG DEFAULT_FILE_DIR
|
||||
ARG DEFAULT_DATA_DIR
|
||||
ARG DEFAULT_CONF_DIR
|
||||
ARG DEFAULT_TEMPLATE_DIR
|
||||
ARG DISTRO_VERSION
|
||||
ARG NODE_VERSION
|
||||
ARG NODE_MANAGER
|
||||
@@ -118,7 +110,7 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
|
||||
|
||||
RUN echo "Initializing the system"; \
|
||||
$SHELL_OPTS; \
|
||||
mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
|
||||
mkdir -p "/root/docker/setup" "/etc/profile.d"; \
|
||||
if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
|
||||
echo ""
|
||||
|
||||
@@ -229,10 +221,6 @@ ARG BUILD_VERSION
|
||||
ARG IMAGE_VERSION
|
||||
ARG GIT_COMMIT
|
||||
ARG WWW_ROOT_DIR
|
||||
ARG DEFAULT_FILE_DIR
|
||||
ARG DEFAULT_DATA_DIR
|
||||
ARG DEFAULT_CONF_DIR
|
||||
ARG DEFAULT_TEMPLATE_DIR
|
||||
ARG DISTRO_VERSION
|
||||
ARG NODE_VERSION
|
||||
ARG NODE_MANAGER
|
||||
|
||||
Reference in New Issue
Block a user