mirror of
https://github.com/dockersrc/alpine
synced 2026-07-21 21:06:46 -04:00
🐛 Fix org URLs, dead template-file vars, and Dockerfile.3.14/.3.15 build bug 🐛
Build and Push 3.14 / build (push) Has been cancelled
Build and Push 3.15 / build (push) Has been cancelled
Build and Push 3.16 / build (push) Has been cancelled
Build and Push 3.17 / build (push) Has been cancelled
Build and Push 3.18 / build (push) Has been cancelled
Build and Push 3.19 / build (push) Has been cancelled
Build and Push 3.20 / build (push) Has been cancelled
Build and Push 3.21 / build (push) Has been cancelled
Build and Push 3.22 / build (push) Has been cancelled
Build and Push 3.23 / build (push) Has been cancelled
Build and Push edge / build (push) Has been cancelled
Build and Push / build (push) Has been cancelled
Build and Push 3.14 / build (push) Has been cancelled
Build and Push 3.15 / build (push) Has been cancelled
Build and Push 3.16 / build (push) Has been cancelled
Build and Push 3.17 / build (push) Has been cancelled
Build and Push 3.18 / build (push) Has been cancelled
Build and Push 3.19 / build (push) Has been cancelled
Build and Push 3.20 / build (push) Has been cancelled
Build and Push 3.21 / build (push) Has been cancelled
Build and Push 3.22 / build (push) Has been cancelled
Build and Push 3.23 / build (push) Has been cancelled
Build and Push edge / build (push) Has been cancelled
Build and Push / build (push) Has been cancelled
Ran the full AI.md sync runbook (gen-dockerfile --update, rootfs regeneration, dead-variable audit) to bring generated files back in line with the template and fix a build-breaking bug. - .env.scripts, .env.scripts.3.14-3.23, .env.scripts.edge, .env.scripts.testing: fixed ENV_GIT_REPO_URL from the wrong "casjaysdevdocker" org to the correct "dockersrc" GitHub org; corrected License header from stale MIT to WTFPL (matches LICENSE.md); removed deprecated DEFAULT_FILE_DIR/DEFAULT_DATA_DIR/ DEFAULT_CONF_DIR/DEFAULT_TEMPLATE_DIR vars; refreshed version/date stamps. - Dockerfile.3.14-3.22, Dockerfile.edge: fixed LABEL org.opencontainers.image.url and .source to point at docker.io/casjaysdev/alpine (was hub.docker.com, registry org is casjaysdev per explicit instruction; GitHub org is dockersrc). - Dockerfile.3.14: restored the three missing ARG DEFAULT_DATA_DIR/CONF_DIR/ TEMPLATE_DIR declarations (global + both build-stage re-declarations) that had been dropped, leaving the "RUN mkdir -p ..." step referencing undefined ARGs. With SHELL_OPTS="set -e -o pipefail" this caused `mkdir -p ""` to fail the build outright. Verified fixed with a full `docker build` of this file. - Dockerfile.3.15: same bug — was missing all three ARG DEFAULT_* blocks (global declarations plus one of the two build-stage re-declarations). Restored to match the structure of Dockerfile.3.16-3.22/edge exactly. Verified fixed with a full `docker build` of this file. - rootfs/root/docker/setup/00-init.sh through 07-cleanup.sh: regenerated from the current template — license header fix, `set -o pipefail` -> `set -eo pipefail`, and 00-init.sh/03-files.sh no longer reference the removed template-files data/config/defaults directories. - rootfs/usr/local/bin/entrypoint.sh: regenerated from the current template — license/date stamp refresh, `return` -> `return 0`, `grep` calls hardened with `--` before pattern arguments, and MTA setup no longer force-succeeds with `|| true`. Confirmed via `hadolint` (no new errors, only pre-existing DL3007 latest-tag warnings shared across the whole Dockerfile fleet) and `sh -n`/`bash -n` on every touched script (clean). No init.d scripts exist in this repo (Step 4 of AI.md's runbook not applicable). rootfs directory layout already standard (Step 7 not applicable — no non-standard top-level dirs found). Dockerfile.3.14 Dockerfile.3.15 Dockerfile.3.16 Dockerfile.3.17 Dockerfile.3.18 Dockerfile.3.19 Dockerfile.3.20 Dockerfile.3.21 Dockerfile.3.22 Dockerfile.edge .env.scripts .env.scripts.3.14 .env.scripts.3.15 .env.scripts.3.16 .env.scripts.3.17 .env.scripts.3.18 .env.scripts.3.19 .env.scripts.3.20 .env.scripts.3.21 .env.scripts.3.22 .env.scripts.3.23 .env.scripts.edge .env.scripts.testing rootfs/root/docker/setup/00-init.sh rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/02-packages.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/04-users.sh rootfs/root/docker/setup/05-custom.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/usr/local/bin/entrypoint.sh
This commit is contained in:
+4
-8
@@ -1,10 +1,10 @@
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
##@Version : 202605242110-git
|
||||
##@Version : 202607081834-git
|
||||
# @@Author : CasjaysDev
|
||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||
# @@License : MIT
|
||||
# @@License : WTFPL
|
||||
# @@Copyright : Copyright 2026 CasjaysDev
|
||||
# @@Created : Sun May 24 09:10:20 PM EDT 2026
|
||||
# @@Created : Wed Jul 8 06:34:40 PM EDT 2026
|
||||
# @@File : .env.scripts
|
||||
# @@Description : Variables for gen-dockerfile and buildx scripts
|
||||
# @@Changelog : newScript
|
||||
@@ -37,7 +37,7 @@ ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Repository URLs (Full URLs)
|
||||
# ENV_GIT_REPO_URL: Complete Git repository URL for source code
|
||||
ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/alpine"
|
||||
ENV_GIT_REPO_URL="https://github.com/dockersrc/alpine"
|
||||
# ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io)
|
||||
ENV_REGISTRY_URL="https://docker.io"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
@@ -72,10 +72,6 @@ NODE_MANAGER="system"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
# Default directories
|
||||
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||
DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
|
||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
Reference in New Issue
Block a user