From f92f43f4355ea70c7032799f91768692f0de89c0 Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 30 Aug 2023 00:15:06 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile .env.scripts --- .env.scripts | 4 +- Dockerfile | 233 --------------------------------------------------- 2 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 Dockerfile diff --git a/.env.scripts b/.env.scripts index 9b14db8..9996462 100644 --- a/.env.scripts +++ b/.env.scripts @@ -11,7 +11,7 @@ # Dockerfile info ENV_DOCKERFILE="Dockerfile" ENV_IMAGE_NAME="nodejs" -ENV_USE_TEMPLATE="alpine" +ENV_USE_TEMPLATE="debian" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Maintainer info ENV_VENDOR="CasjaysDev" @@ -29,7 +29,7 @@ ENV_IMAGE_TAG="latest" ENV_ADD_TAGS="" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Pull image info -ENV_PULL_URL="casjaysdev/alpine" +ENV_PULL_URL="casjaysdev/debian" ENV_DISTRO_TAG="$IMAGE_VERSION" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Env diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e6dfbe0..0000000 --- a/Dockerfile +++ /dev/null @@ -1,233 +0,0 @@ -# Docker image for nodejs using the alpine template -ARG IMAGE_NAME="nodejs" -ARG PHP_SERVER="nodejs" -ARG BUILD_DATE="Tue Aug 29 11:46:45 PM EDT 2023" -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 USER="root" - -ARG SERVICE_PORT="" -ARG EXPOSE_PORTS="1-65535" -ARG PHP_VERSION="" -ARG NODE_VERSION="" -ARG NODE_MANAGER="" - -ARG IMAGE_REPO="casjaysdevdocker/nodejs" -ARG IMAGE_VERSION="latest" -ARG CONTAINER_VERSION="" - -ARG PULL_URL="casjaysdev/alpine" -ARG DISTRO_VERSION="$IMAGE_VERSION" -ARG BUILD_VERSION="${BUILD_DATE}" - -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-nodejs" - -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 \ - echo "Installing packages: $PACK_LIST"; \ - set -ex; \ - pkmgr install ${PACK_LIST}; \ - 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"; \ - BASH_CMD="$(command -v bash 2>/dev/null|| echo '')"; \ - PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || echo '')"; \ - PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || echo '')"; \ - pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || echo "")"; \ - py_version="$($pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || echo "0")"; \ - [ "$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"; \ - export PHP_VERSION=$PHP_VERSION NODE_VERSION=$NODE_VERSION NODE_MANAGER=$NODE_MANAGER; \ - bash -c "$(curl -q -LSsf "https://github.com/templatemgr/nodejs/raw/main/install.sh")"; \ - - -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; \ - echo - -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 - -USER ${USER} -WORKDIR /root - -LABEL maintainer="CasjaysDev " -LABEL org.opencontainers.image.vendor="CasjaysDev" -LABEL org.opencontainers.image.authors="CasjaysDev" -LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" -LABEL org.opencontainers.image.name="${IMAGE_NAME}" -LABEL org.opencontainers.image.base.name="${IMAGE_NAME}" -LABEL org.opencontainers.image.license="${LICENSE}" -LABEL org.opencontainers.image.build-date="${BUILD_DATE}" -LABEL org.opencontainers.image.version="${BUILD_VERSION}" -LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/nodejs" -LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/nodejs" -LABEL org.opencontainers.image.vcs-type="Git" -LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" -LABEL org.opencontainers.image.vcs-url="https://hub.docker.com/r/casjaysdevdocker/nodejs" -LABEL org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/nodejs" -LABEL com.github.containers.toolbox="false" - -ENV ENV=~/.bashrc -ENV SHELL="/bin/bash" -ENV TZ="${TIMEZONE}" -ENV TIMEZONE="${TZ}" -ENV LANG="${LANGUAGE}" -ENV TERM="xterm-256color" -ENV PORT="${SERVICE_PORT}" -ENV ENV_PORTS="${EXPOSE_PORTS}" -ENV CONTAINER_NAME="${IMAGE_NAME}" -ENV HOSTNAME="casjaysdev-${IMAGE_NAME}" -ENV USER="${USER}" - -COPY --from=build /. / - -VOLUME [ "/config","/data" ] - -EXPOSE ${ENV_PORTS} - -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" ]