🗃️ Committing everything that changed 🗃️

2025-12-29 11:29:18 -05:00 · 2022-10-20 16:09:44 -04:00
parent 5e25caf675
commit 769859e040
31 changed files with 536 additions and 104 deletions
--- a/119
+++ b/119
@@ -1,5 +1,4 @@
-FROM golang:1.19-alpine as builder
-
+FROM golang:1.19-alpine AS caddy
 ENV XDG_CONFIG_HOME /config
 ENV XDG_DATA_HOME /data

@@ -24,35 +23,99 @@ RUN apk -U upgrade && \
  --with github.com/caddyserver/transform-encoder \
  --with github.com/caddyserver/replace-response

-FROM casjaysdevdocker/php:latest as php
-COPY --from=builder /caddy /usr/bin/caddy
-COPY ./config/Caddyfile /etc/caddy/Caddyfile
-COPY ./data/htdocs/. /usr/share/caddy/
+FROM casjaysdevdocker/php:latest as build

-COPY ./bin/entrypoint-caddy.sh /usr/local/bin/entrypoint-caddy.sh
+ARG ALPINE_VERSION="v3.16"

-FROM php
-ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')"
-LABEL \
-  org.label-schema.name="caddy" \
-  org.label-schema.description="Alpine based image with caddy and php8." \
-  org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/caddy" \
-  org.label-schema.vcs-url="https://github.com/casjaysdevdocker/caddy" \
-  org.label-schema.build-date=$BUILD_DATE \
-  org.label-schema.version=$BUILD_DATE \
-  org.label-schema.vcs-ref=$BUILD_DATE \
-  org.label-schema.license="WTFPL" \
-  org.label-schema.vcs-type="Git" \
-  org.label-schema.schema-version="1.0" \
-  org.label-schema.vendor="CasjaysDev" \
-  maintainer="CasjaysDev <docker-admin@casjaysdev.com>"
+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"

-EXPOSE 1-65535
+ARG PACK_LIST="bash"

-WORKDIR /data/htdocs
-VOLUME [ "/data", "/config" ]
+ENV LANG=en_US.utf8 \
+  ENV=ENV=~/.bashrc \
+  TZ="America/New_York" \
+  SHELL="/bin/sh" \
+  TERM="xterm-256color" \
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-caddy"

-ENTRYPOINT [ "tini", "--" ]
-HEALTHCHECK --interval=15s --timeout=3s CMD ["/usr/local/bin/entrypoint-caddy.sh", "healthcheck"]
-ENTRYPOINT ["/usr/local/bin/entrypoint-caddy.sh"]
+COPY ./rootfs/. /
+COPY --from=caddy /caddy /usr/bin/caddy

+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
+
+FROM scratch
+
+ARG \
+  SERVICE_PORT="" \
+  EXPOSE_PORTS="1-65535" \
+  PHP_SERVER="caddy" \
+  NODE_VERSION="system" \
+  NODE_MANAGER="system" \
+  BUILD_VERSION="latest" \
+  LICENSE="MIT" \
+  IMAGE_NAME="caddy" \
+  BUILD_DATE="Thu Oct 20 03:58:44 PM EDT 2022" \
+  TIMEZONE="America/New_York"
+
+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" \
+  PHP_SERVER="${PHP_SERVER}" \
+  CONTAINER_NAME="${IMAGE_NAME}" \
+  TZ="${TZ:-America/New_York}" \
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-${IMAGE_NAME}"
+
+COPY --from=build /. /
+
+USER root
+WORKDIR /root
+
+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" ]