🗃️ Committing everything that changed 🗃️

2025-09-17 21:57:48 -04:00 · 2023-01-08 11:20:56 -05:00
parent 507c0430fc
commit c226d783e2
10 changed files with 554 additions and 55 deletions
--- a/125
+++ b/125
@@ -1,82 +1,97 @@
 FROM casjaysdevdocker/alpine:latest AS build

-ARG alpine_version="edge"
+ARG ALPINE_VERSION="v3.16"

-ARG TIMEZONE="America/New_York" \
-  IMAGE_NAME="podman" \
-  LICENSE="MIT" \
-  PORTS=""
+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"

-ENV TZ="$TIMEZONE" \
-  SHELL="/bin/bash" \
+ARG PACK_LIST="bash"
+
+ENV LANG=en_US.UTF-8 \
+  ENV=ENV=~/.bashrc \
+  TZ="America/New_York" \
+  SHELL="/bin/sh" \
  TERM="xterm-256color" \
-  HOSTNAME="${HOSTNAME:-casjaysdev-$IMAGE_NAME}"
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-podman"
+
+COPY ./rootfs/. /

 RUN set -ex; \
  rm -Rf "/etc/apk/repositories"; \
-  mkdir -p "/usr/local/share/template-files/config/defaults/containers" && \
-  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 \
-  openrc \
-  podman \
-  podman-tui \
-  podman-docker \
-  podman-openrc \
-  device-mapper \
-  fuse-overlayfs && \
-  rc-update add podman default && \
-  touch /etc/containers/nodocker && \
-  cp -Rf "/etc/containers/." "/usr/local/share/template-files/config/defaults/containers/"
+  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

-COPY ./bin/. /usr/local/bin/
-COPY ./data/. /usr/local/share/template-files/data/
-COPY ./config/. /usr/local/share/template-files/config/
-
-RUN rm -Rf /bin/.gitkeep /usr/local/bin/.gitkeep /config /data /var/cache/apk/*
+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="2022-10-13" \
-  BUILD_VERSION="latest"
+
+ARG \
+  SERVICE_PORT="80" \
+  EXPOSE_PORTS="80" \
+  PHP_SERVER="podman" \
+  NODE_VERSION="system" \
+  NODE_MANAGER="system" \
+  BUILD_VERSION="latest" \
+  LICENSE="MIT" \
+  IMAGE_NAME="podman" \
+  BUILD_DATE="Sun Nov 13 12:18:23 PM EST 2022" \
+  TIMEZONE="America/New_York"

 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>" \
-  org.opencontainers.image.vcs-type="Git" \
-  org.opencontainers.image.name="podman" \
-  org.opencontainers.image.base.name="podman" \
-  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/podman" \
-  org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/podman" \
-  org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/podman" \
-  org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/podman" \
  org.opencontainers.image.vendor="CasjaysDev" \
  org.opencontainers.image.authors="CasjaysDev" \
-  org.opencontainers.image.description="Containerized version of podman"
+  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}" \
+  com.github.containers.toolbox="false"

-ENV SHELL="/bin/bash" \
+ENV LANG=en_US.UTF-8 \
+  ENV=~/.bashrc \
+  SHELL="/bin/bash" \
+  PORT="${SERVICE_PORT}" \
  TERM="xterm-256color" \
-  HOSTNAME="casjaysdev-podman" \
+  PHP_SERVER="${PHP_SERVER}" \
+  CONTAINER_NAME="${IMAGE_NAME}" \
  TZ="${TZ:-America/New_York}" \
-  TIMEZONE="$$TIMEZONE" \
-  PHP_SERVER="none" \
-  PORT="" \
-  DOCKER_BUILDKIT=0 \
-  DOCKER_HOST="unix://run/podman/podman.sock" \
-  CONTAINER_PASSPHRASE=""
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-${IMAGE_NAME}"

 COPY --from=build /. /

+USER root
 WORKDIR /root

 VOLUME [ "/config","/data" ]

-EXPOSE $PORTS
+EXPOSE $EXPOSE_PORTS

-ENTRYPOINT [ "/sbin/init" ]
-CMD [ "/usr/local/bin/entrypoint-podman.sh" ]
-HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint-podman.sh", "healthcheck" ]
+#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" ]