🗃️ Committing everything that changed 🗃️

2025-11-03 19:02:39 -05:00 · 2023-02-25 13:11:45 -05:00
parent 51484900b9
commit 897552d7a4
13 changed files with 721 additions and 217 deletions
--- a/188
+++ b/188
@@ -1,53 +1,159 @@
-FROM casjaysdevdocker/nginx:latest as build
+# Docker image for tor using the alpine template
+ARG LICENSE="MIT"
+ARG IMAGE_NAME="tor"
+ARG PHP_SERVER="tor"
+ARG BUILD_DATE="Sat Feb 25 01:02:48 PM EST 2023"
+ARG LANGUAGE="en_US.UTF-8"
+ARG TIMEZONE="America/New_York"
+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 LICENSE=WTFPL \
-  IMAGE_NAME=tor \
-  TIMEZONE=America/New_York \
-  PORT="80 9053 9050 9080"
+ARG SERVICE_PORT="9050"
+ARG EXPOSE_PORTS="80 9053 9050 9080"
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"

-ENV SHELL=/bin/bash \
-  TERM=xterm-256color \
-  HOSTNAME=${HOSTNAME:-casjaysdev-$IMAGE_NAME} \
-  TZ=$TIMEZONE
+ARG USER="root"
+ARG DISTRO_VERSION="3.17"
+ARG CONTAINER_VERSION="latest"
+ARG IMAGE_VERSION="${DISTRO_VERSION}"
+ARG BUILD_VERSION="${DISTRO_VERSION}"
+ARG IMAGE_REPO="${IMAGE_REPO}"

-RUN mkdir -p /bin/ /config/ /data/ && \
-  rm -Rf /bin/.gitkeep /config/.gitkeep /data/.gitkeep && \
-  apk update -U --no-cache && \
-  apk add --no-cache tor
+FROM casjaysdevdocker/alpine:${IMAGE_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 NODE_VERSION
+ARG NODE_MANAGER
+ARG BUILD_VERSION
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
+ARG DISTRO_VERSION
+ARG PHP_VERSION

-COPY ./bin/. /usr/local/bin/
-COPY ./config/. /etc/
-COPY ./data/. /data/
+ARG PACK_LIST="bash bash-completion iproute2 ssmtp openssl wget curl jq ca-certificates \
+  tzdata mailcap git ncurses util-linux pciutils usbutils coreutils binutils findutils grep \
+  iproute2 sudo rsync zip certbot tini tor torsocks"

-FROM scratch
-ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')"
-
-LABEL org.label-schema.name="tor" \
-  org.label-schema.description="Containerized version of tor" \
-  org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/tor" \
-  org.label-schema.vcs-url="https://github.com/casjaysdevdocker/tor" \
-  org.label-schema.build-date=$BUILD_DATE \
-  org.label-schema.version=$BUILD_DATE \
-  org.label-schema.vcs-ref=$BUILD_DATE \
-  org.label-schema.license="$LICENSE" \
-  org.label-schema.vcs-type="Git" \
-  org.label-schema.schema-version="latest" \
-  org.label-schema.vendor="CasjaysDev" \
-  maintainer="CasjaysDev <docker-admin@casjaysdev.com>"
-
-ENV SHELL="/bin/bash" \
-  TERM="xterm-256color" \
-  HOSTNAME="casjaysdev-tor" \
-  TZ="${TZ:-America/New_York}"
+ENV ENV=~/.bashrc
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV container="docker"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-tor"

+USER ${USER}
 WORKDIR /root

-VOLUME ["/config","/data"]
+COPY ./rootfs/. /

-EXPOSE $PORT
+RUN set -ex; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge"; \
+  [ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}" ; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \
+  apk update --update-cache && apk add --no-cache ${PACK_LIST}
+
+RUN echo
+
+RUN echo "$TIMEZONE" >"/etc/timezone" ; \
+  touch "/etc/profile" "/root/.profile" ; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null)" ; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf" ; \
+  [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root" ; \
+  sed -i 's|root:x:.*|root:x:0:0:root:/root:/bin/bash|g' "/etc/passwd" ; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" ; \
+  [ -n "$PHP_FPM" ] && [ -z "$(type -P php-fpm)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" ; \
+  rm -rf "/bin/sh" ; BASH_CMD="$(type -P bash)" ; [ -f "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" ; \
+  printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >"/root/.bashrc" ; \
+  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
+
+RUN echo 'Running cleanup' ; \
+  rm -rf /etc/systemd/system/*.wants/* ; \
+  rm -rf /lib/systemd/system/systemd-update-utmp* ; \
+  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/* /usr/share/info/* /tmp/* /var/tmp/* ; \
+  rm -Rf /usr/local/bin/.gitkeep /usr/local/bin/.gitkeep /config /data /var/cache/apk/* ; \
+  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
+
+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 BUILD_VERSION
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
+ARG DISTRO_VERSION
+ARG PHP_VERSION
+
+USER ${USER}
+WORKDIR /root
+
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.vcs-type="Git"
+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.vcs-ref="${BUILD_VERSION}"
+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/${IMAGE_NAME}"
+LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL com.github.containers.toolbox="false"
+
+ENV ENV=~/.bashrc
+ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV container="docker"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV PORT="${SERVICE_PORT}"
+ENV PHP_SERVER="${PHP_SERVER}"
+ENV PHP_VERSION="${PHP_VERSION}"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
+ENV USER="${USER}"

 COPY --from=build /. /

-ENTRYPOINT [ "tini", "--" ]
-HEALTHCHECK --interval=15s --timeout=3s CMD [ "/usr/local/bin/entrypoint-tor.sh", "healthcheck" ]
-CMD [ "/usr/local/bin/entrypoint-tor.sh" ]
+VOLUME [ "/config","/data" ]
+
+EXPOSE $EXPOSE_PORTS
+
+#CMD [ "" ]
+ENTRYPOINT [ "tini", "-p", "SIGTERM", "--", "/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]