mirror of
https://github.com/dockersrc/archlinux
synced 2026-06-24 20:01:00 -04:00
🔧 Restructure entrypoint scripts and update configs 🔧
- Removed legacy entrypoint.sh from rootfs/usr/local/bin and functions directory - Added new healthcheck script to rootfs/usr/local/bin - Updated copy and symlink helper scripts in rootfs/usr/local/bin - Refreshed environment templates and example configs for services - Updated Dockerfile and .env.scripts to align with new layout Dockerfile .env.scripts rootfs/usr/local/bin/copy rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/bin/healthcheck rootfs/usr/local/bin/symlink rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/share/template-files/config/env/default.sample rootfs/usr/local/share/template-files/config/env/examples/addresses.sh rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh rootfs/usr/local/share/template-files/config/env/examples/php.sh rootfs/usr/local/share/template-files/config/env/examples/postgres.sh rootfs/usr/local/share/template-files/config/env/examples/webservers.sh rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
This commit is contained in:
+3
-11
@@ -60,7 +60,7 @@ ARG SHELL_OPTS
|
||||
ARG AUR_USER
|
||||
ARG AUR_HOME
|
||||
|
||||
ARG PACK_LIST="bash-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates jq "
|
||||
ARG PACK_LIST="systemd bash-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates jq "
|
||||
|
||||
ENV ENV=~/.profile
|
||||
ENV SHELL="/bin/sh"
|
||||
@@ -196,15 +196,7 @@ RUN echo "Deleting unneeded files"; \
|
||||
$SHELL_OPTS; \
|
||||
pkmgr clean; \
|
||||
rm -Rf "/config" "/data" || true; \
|
||||
rm -rf /etc/systemd/system/*.wants/* || true; \
|
||||
rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
|
||||
rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
|
||||
rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
|
||||
rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
|
||||
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 [ -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 ""
|
||||
|
||||
@@ -282,5 +274,5 @@ EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
|
||||
|
||||
STOPSIGNAL SIGRTMIN+3
|
||||
|
||||
ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
|
||||
HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
|
||||
ENTRYPOINT [ "/usr/sbin/init" ]
|
||||
HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/healthcheck", "--process", "systemd" ]
|
||||
|
||||
Reference in New Issue
Block a user