mirror of
https://github.com/dockersrc/ubuntu
synced 2026-06-30 17:45:53 -04:00
🔧 Update scripts, remove certbot, add CA cert update 🔧
Update all container scripts to 202605241245-git, remove certbot from all package lists, and add CA certificate update step after install. - .env.scripts*: remove certbot from ENV_PACKAGES (all 7 version files) - Dockerfile*: remove certbot from PACK_LIST (all 7 version Dockerfiles) - rootfs/root/docker/setup/00-init.sh: updated to latest template - rootfs/root/docker/setup/01-system.sh: updated to latest template - rootfs/root/docker/setup/02-packages.sh: add update-ca-certificates/update-ca-trust step - rootfs/root/docker/setup/03-files.sh: updated to latest template - rootfs/root/docker/setup/04-users.sh: updated to latest template - rootfs/root/docker/setup/05-custom.sh: updated to latest template - rootfs/root/docker/setup/06-post.sh: updated to latest template - rootfs/root/docker/setup/07-cleanup.sh: updated to latest template - rootfs/usr/local/bin/entrypoint.sh: updated to 202605241245-git - rootfs/usr/local/bin/pkmgr: updated to 202605241245-git - rootfs/usr/local/etc/docker/functions/entrypoint.sh: updated to 202605241245-git Dockerfile Dockerfile.18.04 Dockerfile.20.04 Dockerfile.22.04 Dockerfile.24.04 Dockerfile.24.10 Dockerfile.26.04 .env.scripts .env.scripts.18.04 .env.scripts.20.04 .env.scripts.22.04 .env.scripts.24.04 .env.scripts.24.10 .env.scripts.26.04 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 rootfs/usr/local/bin/pkmgr rootfs/usr/local/etc/docker/functions/entrypoint.sh
This commit is contained in:
+15
-23
@@ -1,7 +1,7 @@
|
||||
# Docker image for ubuntu using the ubuntu template
|
||||
ARG IMAGE_NAME="ubuntu"
|
||||
ARG PHP_SERVER="ubuntu"
|
||||
ARG BUILD_DATE="202509161230"
|
||||
ARG BUILD_DATE="202605242104"
|
||||
ARG LANGUAGE="en_US.UTF-8"
|
||||
ARG TIMEZONE="America/New_York"
|
||||
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||
@@ -24,9 +24,9 @@ ARG NODE_MANAGER="system"
|
||||
|
||||
ARG IMAGE_REPO="casjaysdev/ubuntu"
|
||||
ARG IMAGE_VERSION="26.04"
|
||||
ARG CONTAINER_VERSION="resolute"
|
||||
ARG CONTAINER_VERSION=""
|
||||
|
||||
ARG PULL_URL="ubuntu"
|
||||
ARG PULL_URL="casjaysdev/ubuntu"
|
||||
ARG DISTRO_VERSION="${IMAGE_VERSION}"
|
||||
ARG BUILD_VERSION="${BUILD_DATE}"
|
||||
|
||||
@@ -57,7 +57,7 @@ ARG PHP_SERVER
|
||||
ARG SHELL_OPTS
|
||||
ARG DEBIAN_FRONTEND
|
||||
|
||||
ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip certbot ca-certificates jq "
|
||||
ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-pip ca-certificates "
|
||||
|
||||
ENV ENV=~/.profile
|
||||
ENV SHELL="/bin/sh"
|
||||
@@ -73,7 +73,7 @@ ENV DEBIAN_FRONTEND="${DEBIAN_FRONTEND}"
|
||||
USER ${USER}
|
||||
WORKDIR /root
|
||||
|
||||
COPY ./rootfs/usr/local/bin/. /usr/local/bin/
|
||||
COPY ./rootfs/. /
|
||||
|
||||
RUN set -e; \
|
||||
echo "Updating the system and ensuring bash is installed"; \
|
||||
@@ -83,18 +83,10 @@ RUN set -e; \
|
||||
echo "Setting up prerequisites"; \
|
||||
echo "$LANG UTF-8" >"/etc/locale.gen"; \
|
||||
echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \
|
||||
arch="$(dpkg --print-architecture)"; \
|
||||
case "$arch" in amd64|i386) ubuntu_mirror="http://archive.ubuntu.com/ubuntu"; ubuntu_security="http://security.ubuntu.com/ubuntu" ;; *) ubuntu_mirror="http://ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
|
||||
printf '%s\n' \
|
||||
"deb ${ubuntu_mirror} resolute main restricted universe multiverse" \
|
||||
"deb ${ubuntu_mirror} resolute-updates main restricted universe multiverse" \
|
||||
"deb ${ubuntu_mirror} resolute-backports main restricted universe multiverse" \
|
||||
"deb ${ubuntu_security} resolute-security main restricted universe multiverse" > /etc/apt/sources.list; \
|
||||
rm -f /etc/apt/sources.list.d/*.list /etc/apt/sources.list.d/*.sources 2>/dev/null || true; \
|
||||
apt-get update && apt-get upgrade -yy && apt-get install -yy bash locales apt-utils; \
|
||||
update-alternatives --install /bin/sh sh /bin/bash 1; \
|
||||
update-alternatives --install /usr/bin/sh sh /bin/bash 1; \
|
||||
locale-gen $LANG && update-locale LANG=$LANG
|
||||
dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG
|
||||
|
||||
ENV SHELL="/bin/bash"
|
||||
SHELL [ "/bin/bash", "-c" ]
|
||||
@@ -127,7 +119,6 @@ RUN echo "Initializing packages before copying files to image"; \
|
||||
if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
|
||||
echo ""
|
||||
|
||||
COPY ./rootfs/. /
|
||||
COPY ./Dockerfile.26.04 /root/docker/Dockerfile
|
||||
|
||||
RUN echo "Updating system files "; \
|
||||
@@ -137,7 +128,7 @@ RUN echo "Updating system files "; \
|
||||
echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
|
||||
[ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
|
||||
PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
|
||||
PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
|
||||
set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
|
||||
pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
|
||||
py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
|
||||
[ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
|
||||
@@ -194,7 +185,7 @@ RUN echo "Deleting unneeded files"; \
|
||||
rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
|
||||
rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
|
||||
rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
|
||||
if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
|
||||
if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
|
||||
if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
|
||||
echo ""
|
||||
|
||||
@@ -211,6 +202,7 @@ ARG SERVICE_PORT
|
||||
ARG EXPOSE_PORTS
|
||||
ARG BUILD_VERSION
|
||||
ARG IMAGE_VERSION
|
||||
ARG GIT_COMMIT
|
||||
ARG WWW_ROOT_DIR
|
||||
ARG DEFAULT_FILE_DIR
|
||||
ARG DEFAULT_DATA_DIR
|
||||
@@ -237,12 +229,12 @@ LABEL org.opencontainers.image.authors="${LICENSE}"
|
||||
LABEL org.opencontainers.image.created="${BUILD_DATE}"
|
||||
LABEL org.opencontainers.image.version="${BUILD_VERSION}"
|
||||
LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
|
||||
LABEL org.opencontainers.image.url="docker.io"
|
||||
LABEL org.opencontainers.image.source="docker.io"
|
||||
LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/ubuntu"
|
||||
LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/ubuntu"
|
||||
LABEL org.opencontainers.image.vcs-type="Git"
|
||||
LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
|
||||
LABEL org.opencontainers.image.source="https://github.com/dockersrc/ubuntu"
|
||||
LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/ubuntu"
|
||||
LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
|
||||
LABEL org.opencontainers.image.source="https://github.com/casjaysdev/ubuntu"
|
||||
LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/ubuntu"
|
||||
LABEL com.github.containers.toolbox="false"
|
||||
|
||||
ENV ENV=~/.bashrc
|
||||
@@ -272,6 +264,6 @@ EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
|
||||
|
||||
STOPSIGNAL SIGRTMIN+3
|
||||
|
||||
CMD [ "tail", "-f", "/dev/null" ]
|
||||
ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
|
||||
HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user