mirror of
https://github.com/dockersrc/go
synced 2026-08-09 02:01:12 -04:00
🔧 Update to latest docker template revision 🔧
- .env.scripts: synced ENV_PACKAGES to current template (msmtp, sudo, unzip, iproute2, and other base tools added) - Dockerfile: added go-toolchain build stage; expanded PACK_LIST to match; apk upgrade and bash/sh symlink setup added to build stage - rootfs/root/docker/setup/0*.sh: version stamp bumped to current template revision; app-specific logic in 05-custom.sh unchanged - rootfs/usr/local/bin/entrypoint.sh: version stamp bumped to current template revision
This commit is contained in:
+3
-3
@@ -1,10 +1,10 @@
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112108-git
|
##@Version : 202607130228-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 09:08:33 PM EDT 2026
|
# @@Created : Mon Jul 13 02:28:39 AM EDT 2026
|
||||||
# @@File : .env.scripts
|
# @@File : .env.scripts
|
||||||
# @@Description : Variables for gen-dockerfile and buildx scripts
|
# @@Description : Variables for gen-dockerfile and buildx scripts
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
|
|||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
ENV_PACKAGES="git make bash tini ca-certificates openssh-client curl wget tar tzdata jq build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev"
|
ENV_PACKAGES="bash-completion git curl wget sudo unzip iproute2 msmtp openssl jq tzdata mailcap ncurses ncurses-terminfo-base util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tar tini py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates make openssh-client build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# ex: ts=2 sw=2 et filetype=sh
|
# ex: ts=2 sw=2 et filetype=sh
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|||||||
+20
-4
@@ -30,6 +30,10 @@ ARG BUILD_VERSION="${BUILD_DATE}"
|
|||||||
|
|
||||||
FROM tianon/gosu:latest AS gosu
|
FROM tianon/gosu:latest AS gosu
|
||||||
|
|
||||||
|
# Go toolchain matching the final image's target platform (not the build host).
|
||||||
|
# Copied verbatim into the build stage so the image ships an actual go compiler.
|
||||||
|
FROM golang:alpine AS go-toolchain
|
||||||
|
|
||||||
# Build Go tools natively on the host platform using Go's cross-compilation.
|
# Build Go tools natively on the host platform using Go's cross-compilation.
|
||||||
# This avoids QEMU emulation for arm64 and reduces compile time from hours to minutes.
|
# This avoids QEMU emulation for arm64 and reduces compile time from hours to minutes.
|
||||||
FROM --platform=$BUILDPLATFORM golang:alpine AS go-tools
|
FROM --platform=$BUILDPLATFORM golang:alpine AS go-tools
|
||||||
@@ -78,7 +82,7 @@ ARG PHP_SERVER
|
|||||||
ARG SHELL_OPTS
|
ARG SHELL_OPTS
|
||||||
ARG PATH
|
ARG PATH
|
||||||
|
|
||||||
ARG PACK_LIST="git make bash tini ca-certificates openssh-client curl wget tar tzdata jq build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev "
|
ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 msmtp openssl jq tzdata mailcap ncurses ncurses-terminfo-base util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tar tini py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates make openssh-client build-base gcc musl-dev pkgconf openssl-dev libffi-dev zlib-dev linux-headers protobuf protobuf-dev "
|
||||||
|
|
||||||
ENV ENV=~/.profile
|
ENV ENV=~/.profile
|
||||||
ENV SHELL="/bin/sh"
|
ENV SHELL="/bin/sh"
|
||||||
@@ -101,15 +105,26 @@ ENV GITHUB_TOKEN="${GITHUB_TOKEN}"
|
|||||||
USER ${USER}
|
USER ${USER}
|
||||||
WORKDIR /root
|
WORKDIR /root
|
||||||
|
|
||||||
|
RUN set -e; \
|
||||||
|
echo "Updating the system"; \
|
||||||
|
apk upgrade --no-cache
|
||||||
|
|
||||||
COPY ./rootfs/. /
|
COPY ./rootfs/. /
|
||||||
|
|
||||||
RUN set -e; \
|
RUN set -e; \
|
||||||
echo "Updating the system and ensuring bash is installed"; \
|
echo "Ensuring bash and system certs are installed"; \
|
||||||
pkmgr update;pkmgr install bash
|
pkmgr install bash ca-certificates; \
|
||||||
|
update-ca-certificates
|
||||||
|
|
||||||
RUN set -e; \
|
RUN set -e; \
|
||||||
echo "Setting up prerequisites"; \
|
echo "Setting up prerequisites"; \
|
||||||
true
|
apk --no-cache add bash; \
|
||||||
|
SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
|
||||||
|
BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
|
||||||
|
[ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
|
||||||
|
[ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
|
||||||
|
[ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
|
||||||
|
[ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
|
||||||
|
|
||||||
ENV SHELL="/bin/bash"
|
ENV SHELL="/bin/bash"
|
||||||
SHELL [ "/bin/bash", "-c" ]
|
SHELL [ "/bin/bash", "-c" ]
|
||||||
@@ -187,6 +202,7 @@ RUN echo "Custom Applications"; \
|
|||||||
$SHELL_OPTS; \
|
$SHELL_OPTS; \
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
COPY --from=go-toolchain /usr/local/go/ /usr/local/go/
|
||||||
COPY --from=go-tools /go/bin/ /usr/local/bin/
|
COPY --from=go-tools /go/bin/ /usr/local/bin/
|
||||||
|
|
||||||
RUN echo "Running custom commands"; \
|
RUN echo "Running custom commands"; \
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:27 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:56 AM EDT 2026
|
||||||
# @@File : 00-init.sh
|
# @@File : 00-init.sh
|
||||||
# @@Description : script to run init
|
# @@Description : script to run init
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:27 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:57 AM EDT 2026
|
||||||
# @@File : 01-system.sh
|
# @@File : 01-system.sh
|
||||||
# @@Description : script to run system
|
# @@Description : script to run system
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:28 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:57 AM EDT 2026
|
||||||
# @@File : 02-packages.sh
|
# @@File : 02-packages.sh
|
||||||
# @@Description : script to run packages
|
# @@Description : script to run packages
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:28 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:57 AM EDT 2026
|
||||||
# @@File : 03-files.sh
|
# @@File : 03-files.sh
|
||||||
# @@Description : script to run files
|
# @@Description : script to run files
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:29 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:57 AM EDT 2026
|
||||||
# @@File : 04-users.sh
|
# @@File : 04-users.sh
|
||||||
# @@Description : script to run users
|
# @@Description : script to run users
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:29 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:58 AM EDT 2026
|
||||||
# @@File : 05-custom.sh
|
# @@File : 05-custom.sh
|
||||||
# @@Description : script to run custom
|
# @@Description : script to run custom
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:29 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:58 AM EDT 2026
|
||||||
# @@File : 06-post.sh
|
# @@File : 06-post.sh
|
||||||
# @@Description : script to run post
|
# @@Description : script to run post
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
##@Version : 202607112314-git
|
##@Version : 202607130230-git
|
||||||
# @@Author : CasjaysDev
|
# @@Author : CasjaysDev
|
||||||
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
|
||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@Copyright : Copyright 2026 CasjaysDev
|
# @@Copyright : Copyright 2026 CasjaysDev
|
||||||
# @@Created : Sat Jul 11 11:14:30 PM EDT 2026
|
# @@Created : Mon Jul 13 02:30:58 AM EDT 2026
|
||||||
# @@File : 07-cleanup.sh
|
# @@File : 07-cleanup.sh
|
||||||
# @@Description : script to run cleanup
|
# @@Description : script to run cleanup
|
||||||
# @@Changelog : newScript
|
# @@Changelog : newScript
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# @@License : WTFPL
|
# @@License : WTFPL
|
||||||
# @@ReadME : entrypoint.sh --help
|
# @@ReadME : entrypoint.sh --help
|
||||||
# @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments
|
# @@Copyright : Copyright: (c) 2026 Jason Hempstead, Casjays Developments
|
||||||
# @@Created : Saturday, Jul 11, 2026 23:13 EDT
|
# @@Created : Monday, Jul 13, 2026 02:30 EDT
|
||||||
# @@File : entrypoint.sh
|
# @@File : entrypoint.sh
|
||||||
# @@Description : Entrypoint file for go
|
# @@Description : Entrypoint file for go
|
||||||
# @@Changelog : New script
|
# @@Changelog : New script
|
||||||
|
|||||||
Reference in New Issue
Block a user