From aef1d02130548921066f1909de310ff9b307deb1 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Sun, 8 Jan 2023 11:19:44 -0500
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 | 56 ++++++++++++++++++++----------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c7a1d33..1a380e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,12 @@
-FROM casjaysdevdocker/debian:latest AS build
+FROM casjaysdevdocker/alpine:latest AS build
 
-ARG DEBIAN_VERSION="bullseye"
+ARG ALPINE_VERSION="v3.16"
 
 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 PACK_LIST="unzip"
-
-ARG DEBUG="" \
-  DENO_VERSION="v1.26.1"
+ARG PACK_LIST="bash"
 
 ENV LANG=en_US.UTF-8 \
   ENV=ENV=~/.bashrc \
@@ -17,32 +14,22 @@ ENV LANG=en_US.UTF-8 \
   SHELL="/bin/sh" \
   TERM="xterm-256color" \
   TIMEZONE="${TZ:-$TIMEZONE}" \
-  HOSTNAME="casjaysdev-deno" \
-  DEBIAN_FRONTEND="noninteractive" \
-  DENO_VERSION="$DENO_VERSION" \
-  DEBUG="$DEBUG"
+  HOSTNAME="casjaysdev-deno"
 
 COPY ./rootfs/. /
 
 RUN set -ex; \
-  rm -Rf "/etc/apt/sources.list" ; \
-  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" ; \
-  echo 'export DEBIAN_FRONTEND="noninteractive"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh" && \
-  echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION} main contrib non-free" >>"/etc/apt/sources.list" ; \
-  echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-updates main contrib non-free" >>"/etc/apt/sources.list" ; \
-  echo "deb http://deb.debian.org/debian-security/ ${DEBIAN_VERSION}-security main contrib non-free" >>"/etc/apt/sources.list" ; \
-  apt-get update -yy && apt-get upgrade -yy && apt-get install -yy ${PACK_LIST} && \
-  sed -i -e "s/# en_US.UTF-8.*/en_US.UTF-8 UTF-8/" /etc/locale.gen && \
-  dpkg-reconfigure --frontend=noninteractive locales && \
-  update-locale LANG=en_US.UTF-8 && \
-  git clone -q "https://github.com/casjay-templates/denojs" "${DEFAULT_DATA_DIR}/htdocs/www" && \
-  /usr/local/bin/get-deno.sh
+  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' ; \
-  apt-get clean ; \
-  update-alternatives --install /bin/sh sh /bin/bash 1 ; \
-  rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* usr/local/bin/get-deno.sh; \
-  rm -Rf /usr/local/bin/.gitkeep /config /data /var/lib/apt/lists/* ; \
+  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/* ; \
@@ -55,15 +42,15 @@ RUN echo 'Running cleanup' ; \
 FROM scratch
 
 ARG \
-  SERVICE_PORT="" \
-  EXPOSE_PORTS="1-65535" \
+  SERVICE_PORT="80" \
+  EXPOSE_PORTS="80" \
   PHP_SERVER="deno" \
   NODE_VERSION="system" \
   NODE_MANAGER="system" \
   BUILD_VERSION="latest" \
   LICENSE="MIT" \
   IMAGE_NAME="deno" \
-  BUILD_DATE="Fri Oct 21 12:36:59 AM EDT 2022" \
+  BUILD_DATE="Sun Nov 13 12:16:08 PM EST 2022" \
   TIMEZONE="America/New_York"
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>" \
@@ -81,7 +68,8 @@ LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>" \
   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.description="Containerized version of ${IMAGE_NAME}" \
+  com.github.containers.toolbox="false"
 
 ENV LANG=en_US.UTF-8 \
   ENV=~/.bashrc \
@@ -89,18 +77,15 @@ ENV LANG=en_US.UTF-8 \
   PORT="${SERVICE_PORT}" \
   TERM="xterm-256color" \
   PHP_SERVER="${PHP_SERVER}" \
-  NODE_VERSION="${NODE_VERSION}" \
-  NODE_MANAGER="${NODE_MANAGER}" \
   CONTAINER_NAME="${IMAGE_NAME}" \
   TZ="${TZ:-America/New_York}" \
   TIMEZONE="${TZ:-$TIMEZONE}" \
-  HOSTNAME="casjaysdev-${IMAGE_NAME}" \
-  USER="root"
+  HOSTNAME="casjaysdev-${IMAGE_NAME}"
 
 COPY --from=build /. /
 
 USER root
-WORKDIR /data/htdocs/www
+WORKDIR /root
 
 VOLUME [ "/config","/data" ]
 
@@ -109,3 +94,4 @@ 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" ]
+