🗃️ Committing everything that changed 🗃️

bin/entrypoint-nextcloud.sh bin/.gitkeep bin/healthcheck bin/occ config/cont-init.d/00-fix-logs.sh config/cont-init.d/01-fix-uidgid.sh config/cont-init.d/02-fix-perms.sh config/cont-init.d/03-config.sh config/cont-init.d/04-svc-main.sh config/cont-init.d/05-svc-cron.sh config/cont-init.d/06-svc-previewgen.sh config/cont-init.d/07-svc-news-updater.sh config/.gitkeep config/php/conf.d/smbclient.ini config/tpls/bootstrap.php config/tpls/etc/nginx/nginx.conf config/tpls/etc/php/conf.d/apcu.ini config/tpls/etc/php/conf.d/opcache.ini config/tpls/etc/php/conf.d/override.ini config/tpls/etc/php/php-fpm.d/www.conf data/.gitkeep Dockerfile .env.scripts .gitattributes .gitignore rootfs/.gitkeep rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/bin/.gitkeep rootfs/usr/local/bin/next-cloud rootfs/usr/local/bin/occ rootfs/usr/local/bin/pkmgr rootfs/usr/local/bin/start-nextcloud.sh rootfs/usr/local/etc/ rootfs/usr/local/share/template-files/config/env/
2025-09-17 21:57:52 -04:00 · 2024-07-07 15:33:36 -04:00
parent b7e94234a6
commit 233e048552
54 changed files with 2709 additions and 1222 deletions
--- a/267
+++ b/267
@@ -1,97 +1,238 @@
-FROM casjaysdevdocker/alpine:latest AS build
+# Docker image for nextcloud using the alpine template
+ARG IMAGE_NAME="nextcloud"
+ARG PHP_SERVER="nextcloud"
+ARG BUILD_DATE="Sun Jul  7 03:00:44 PM EDT 2024"
+ARG LANGUAGE="en_US.UTF-8"
+ARG TIMEZONE="America/New_York"
+ARG WWW_ROOT_DIR="/usr/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 ALPINE_VERSION="v3.16"
+ARG USER="root"

-ARG 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"
+ARG SERVICE_PORT=""
+ARG EXPOSE_PORTS=""
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"

-ARG PACK_LIST="bash"
+ARG IMAGE_REPO="casjaysdevdocker/nextcloud"
+ARG IMAGE_VERSION="latest"
+ARG CONTAINER_VERSION=""

-ENV LANG=en_US.UTF-8 \
-  ENV=ENV=~/.bashrc \
-  TZ="America/New_York" \
-  SHELL="/bin/sh" \
-  TERM="xterm-256color" \
-  TIMEZONE="${TZ:-$TIMEZONE}" \
-  HOSTNAME="casjaysdev-nextcloud"
+ARG PULL_URL="casjaysdevdocker/docker"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
+ARG BUILD_VERSION="${BUILD_DATE}"

-COPY ./rootfs/. /
+FROM tianon/gosu:latest AS gosu
+FROM ${PULL_URL}:${DISTRO_VERSION} AS build
+ARG USER
+ARG LICENSE
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG PHP_SERVER
+ARG BUILD_DATE
+ARG SERVICE_PORT
+ARG EXPOSE_PORTS
+ARG BUILD_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 PHP_VERSION
+
+ARG PACK_LIST="bash \
+  "
+
+ENV ENV=~/.bashrc
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-nextcloud"
+
+USER ${USER}
+WORKDIR /root
+
+COPY ./rootfs/usr/local/bin/pkmgr /usr/local/bin/pkmgr
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+
+RUN \
+  set -ex; \
+  echo ""
+
+RUN \
+  set -ex; \
+  if [ -f "/root/docker/setup/init" ];then echo "Running the init script";sh "/root/docker/setup/init";echo "Done running the init script";fi; \
+  echo ""
+
+RUN set -ex; \
+  echo ""
+
+COPY ./rootfs/. /
+COPY ./Dockerfile /root/docker/Dockerfile
+
+RUN set -ex; \
+  echo ""
+
+RUN \
+  set -ex; \
+  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";pkmgr install ${PACK_LIST};fi; \
+  echo ""
+
+RUN \
+  set -ex; \
+  if [ -f "/root/docker/setup/packages" ];then echo "Running the packages script";sh "/root/docker/setup/packages";echo "Done running the packages script";fi
+
+RUN \
+  echo "Updating system files "; \
+  set -ex; \
+  echo "$TIMEZONE" >"/etc/timezone"; \
+  touch "/etc/profile" "/root/.profile"; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
+  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
+  BASH_CMD="$(command -v bash 2>/dev/null|| true)"; \
+  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
+  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=""; \
+  if [ -n "$pip_bin" ];then $pip_bin -m pip install certbot-dns-rfc2136 certbot-dns-duckdns certbot-dns-cloudflare certbot-nginx $pip_opts || true;fi; \
+  [ -f "$BASH_CMD" ] && rm -rf "/bin/sh" && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:$BASH_CMD|g' "/etc/passwd" || true; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
+  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
+  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
+  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
+  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
+  if [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
+  echo ""
+
+RUN set -ex \
+  echo "Custom Settings"; \
+  echo ""
+
+RUN \
+  echo "Setting up users and scripts "; \
+  set -ex; \
+  echo ""
+
+RUN \
+  echo "Running user configurations "; \
+  set -ex; \
+  echo ""
+
+RUN \
+  echo "Setting OS Settings "; \
+  set -ex; \
+  echo ""
+
+RUN set -ex; \
+  echo "Custom Applications"; \
+  echo ""
+
+RUN \
+  set -ex; \
+  if [ -f "/root/docker/setup/custom" ];then echo "Running the custom script";sh "/root/docker/setup/custom";echo "Done running the custom script";fi; \
+  echo ""

 RUN set -ex; \
-  rm -Rf "/etc/apk/repositories"; \
-  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/main" >>"/etc/apk/repositories"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/community" >>"/etc/apk/repositories"; \
-  if [ "${ALPINE_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \
-  apk update --update-cache && apk add --no-cache ${PACK_LIST} && \
  echo

-RUN echo 'Running cleanup' ; \
-  rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* ; \
-  rm -Rf /usr/local/bin/.gitkeep /usr/local/bin/.gitkeep /config /data /var/cache/apk/* ; \
-  rm -rf /lib/systemd/system/multi-user.target.wants/* ; \
-  rm -rf /etc/systemd/system/*.wants/* ; \
-  rm -rf /lib/systemd/system/local-fs.target.wants/* ; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*udev* ; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* ; \
-  rm -rf /lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup* ; \
-  rm -rf /lib/systemd/system/systemd-update-utmp* ; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ]; then cd "/lib/systemd/system/sysinit.target.wants" && rm $(ls | grep -v systemd-tmpfiles-setup) ; fi
+RUN \
+  set -ex; \
+  if [ -f "/root/docker/setup/post" ];then echo "Running the post script";sh "/root/docker/setup/post";echo "Done running the post script";fi; \
+  echo ""

+RUN \
+  echo "Deleting unneeded files"; \
+  set -ex; \
+  pkmgr clean; \
+  rm -Rf "/config" "/data"; \
+  rm -rf /etc/systemd/system/*.wants/*; \
+  rm -rf /lib/systemd/system/systemd-update-utmp*; \
+  rm -rf /lib/systemd/system/anaconda.target.wants/*; \
+  rm -rf /lib/systemd/system/local-fs.target.wants/*; \
+  rm -rf /lib/systemd/system/multi-user.target.wants/*; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*udev*; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*initctl*; \
+  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/*; \
+  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
+
+RUN echo "Init done"
 FROM scratch
+ARG USER
+ARG LICENSE
+ARG LANGUAGE
+ARG TIMEZONE
+ARG IMAGE_NAME
+ARG PHP_SERVER
+ARG BUILD_DATE
+ARG SERVICE_PORT
+ARG EXPOSE_PORTS
+ARG NODE_VERSION
+ARG NODE_MANAGER
+ARG PHP_VERSION
+ARG BUILD_VERSION
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
+ARG DISTRO_VERSION

-ARG \
-  SERVICE_PORT="80" \
-  EXPOSE_PORTS="80" \
-  PHP_SERVER="nextcloud" \
-  NODE_VERSION="system" \
-  NODE_MANAGER="system" \
-  BUILD_VERSION="latest" \
-  LICENSE="MIT" \
-  IMAGE_NAME="nextcloud" \
-  BUILD_DATE="Sun Nov 13 12:17:42 PM EST 2022" \
-  TIMEZONE="America/New_York"
+USER ${USER}
+WORKDIR /root

-LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>" \
+LABEL \
+  maintainer="CasjaysDev <docker-admin@casjaysdev.pro>" \
  org.opencontainers.image.vendor="CasjaysDev" \
  org.opencontainers.image.authors="CasjaysDev" \
-  org.opencontainers.image.vcs-type="Git" \
+  org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" \
  org.opencontainers.image.name="${IMAGE_NAME}" \
  org.opencontainers.image.base.name="${IMAGE_NAME}" \
  org.opencontainers.image.license="${LICENSE}" \
-  org.opencontainers.image.vcs-ref="${BUILD_VERSION}" \
  org.opencontainers.image.build-date="${BUILD_DATE}" \
  org.opencontainers.image.version="${BUILD_VERSION}" \
  org.opencontainers.image.schema-version="${BUILD_VERSION}" \
-  org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}" \
-  org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \
-  org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \
-  org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}" \
-  org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" \
+  org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/nextcloud" \
+  org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/nextcloud" \
+  org.opencontainers.image.vcs-type="Git" \
+  org.opencontainers.image.vcs-ref="${BUILD_VERSION}" \
+  org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/nextcloud" \
+  org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/nextcloud" \
  com.github.containers.toolbox="false"

-ENV LANG=en_US.UTF-8 \
+ENV \
  ENV=~/.bashrc \
+  USER="${USER}" \
  SHELL="/bin/bash" \
-  PORT="${SERVICE_PORT}" \
+  TZ="${TIMEZONE}" \
+  TIMEZONE="${TZ}" \
+  LANG="${LANGUAGE}" \
  TERM="xterm-256color" \
-  PHP_SERVER="${PHP_SERVER}" \
+  PORT="${SERVICE_PORT}" \
+  ENV_PORTS="${EXPOSE_PORTS}" \
  CONTAINER_NAME="${IMAGE_NAME}" \
-  TZ="${TZ:-America/New_York}" \
-  TIMEZONE="${TZ:-$TIMEZONE}" \
-  HOSTNAME="casjaysdev-${IMAGE_NAME}"
+  HOSTNAME="casjaysdev-${IMAGE_NAME}" \
+  PHP_SERVER="${PHP_SERVER}" \
+  NODE_VERSION="${NODE_VERSION}" \
+  NODE_MANAGER="${NODE_MANAGER}" \
+  PHP_VERSION="${PHP_VERSION}" \
+  DISTRO_VERSION="${IMAGE_VERSION}"

 COPY --from=build /. /

-USER root
-WORKDIR /root
-
 VOLUME [ "/config","/data" ]

-EXPOSE $EXPOSE_PORTS
+EXPOSE ${ENV_PORTS}

-#CMD [ "" ]
-ENTRYPOINT [ "tini", "-p", "SIGTERM", "--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "start","all" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-