🗃️ Committing everything that changed 🗃️

Dockerfile

@@ -1,66 +1,100 @@
-FROM casjaysdevdocker/nginx:latest as build
+FROM casjaysdevdocker/alpine:latest AS build
 
-ARG LICENSE=WTFPL \
-  IMAGE_NAME=aria2 \
-  TIMEZONE=America/New_York \
-  PORT=6800 \
-  ARIANG_VERSION=1.2.4 \
-  DOMAIN=0.0.0.0:8080
+ARG ALPINE_VERSION="v3.16"
+ARG ARIANG_VERSION="1.2.4 "
 
-ENV SHELL=/bin/bash \
-  TERM=xterm-256color \
-  HOSTNAME=${HOSTNAME:-casjaysdev-$IMAGE_NAME} \
-  TZ=$TIMEZONE
+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"
 
-WORKDIR /usr/local/www/ariang
+ARG PACK_LIST="bash aria2 unzip nginx"
 
-RUN mkdir -p /bin/ /config/ /data/ && \
-  rm -Rf /bin/.gitkeep /config/.gitkeep /data/.gitkeep && \
-  apk update -U --no-cache && \
-  apk add --no-cache \
-  aria2 \
-  unzip && \
-  rm -R /etc/nginx && \
-  mkdir -p /aria2/config /aria2/data /tmp/ariang /usr/local/www/ariang && \
-  cd /tmp/ariang && \
+ENV LANG=en_US.utf8 \
+  ENV=ENV=~/.bashrc \
+  TZ="America/New_York" \
+  SHELL="/bin/sh" \
+  TERM="xterm-256color" \
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-aria2"
+
+COPY ./rootfs/. /
+
+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} && \
   curl -q -LSsf https://github.com/mayswind/AriaNg/releases/download/$ARIANG_VERSION/AriaNg-$ARIANG_VERSION.zip -o /tmp/AriaNg-$ARIANG_VERSION.zip && \
   unzip /tmp/AriaNg-$ARIANG_VERSION.zip && \
-  rsync -ahP /tmp/ariang/. /usr/local/www/ariang/ && \
-  rm -Rf /tmp/ariang
+  mkdir -p /var/www/ariang && \
+  rsync -ahP /tmp/ariang/. /var/www/ariang/ && \
+  rm -Rf /tmp/ariang /tmp/AriaNg-$ARIANG_VERSION.zip
 
-COPY ./bin/. /usr/local/bin/
-COPY ./config/. /config/
-COPY ./data/. /data/
+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
 
 FROM scratch
-ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')"
 
-LABEL org.label-schema.name="aria2" \
-  org.label-schema.description="Aria2 downloader and AriaNg webui Docker image based on Alpine Linux" \
-  org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/aria2" \
-  org.label-schema.vcs-url="https://github.com/casjaysdevdocker/aria2" \
-  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>"
+ARG \
+  SERVICE_PORT="6800" \
+  EXPOSE_PORTS="6800" \
+  PHP_SERVER="aria2" \
+  NODE_VERSION="system" \
+  NODE_MANAGER="system" \
+  BUILD_VERSION="latest" \
+  LICENSE="MIT" \
+  IMAGE_NAME="aria2" \
+  BUILD_DATE="Wed Oct 19 05:13:52 PM EDT 2022" \
+  TIMEZONE="America/New_York"
 
-ENV SHELL="/bin/bash" \
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>" \
+  org.opencontainers.image.vendor="CasjaysDev" \
+  org.opencontainers.image.authors="CasjaysDev" \
+  org.opencontainers.image.vcs-type="Git" \
+  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}"
+
+ENV LANG=en_US.utf8 \
+  ENV=~/.bashrc \
+  SHELL="/bin/bash" \
+  PORT="${SERVICE_PORT}" \
   TERM="xterm-256color" \
-  HOSTNAME="casjaysdev-aria2" \
-  TZ="${TZ:-America/New_York}"
-
-WORKDIR /aria2
-
-VOLUME ["/root", "/aria2/data", "/aria2/config"]
-
-EXPOSE $PORT
+  PHP_SERVER="${PHP_SERVER}" \
+  CONTAINER_NAME="${IMAGE_NAME}" \
+  TZ="${TZ:-America/New_York}" \
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-${IMAGE_NAME}"
 
 COPY --from=build /. /
 
-HEALTHCHECK --interval=15s --timeout=3s CMD ["/usr/local/bin/entrypoint-aria2.sh", "healthcheck"]
+USER root
+WORKDIR /data/aria2
 
-ENTRYPOINT ["/usr/local/bin/entrypoint-aria2.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" ]