🗃️ Committing everything that changed 🗃️

Dockerfile

@@ -1,89 +1,97 @@
-FROM casjaysdevdocker/alpine:latest as build
+FROM casjaysdevdocker/alpine:latest AS build
 
-WORKDIR /app/src
+ARG ALPINE_VERSION="v3.16"
 
-ENV \
-  EMBEDDED_ASSETS="ON" \
-  ENABLE_FLAC="ON" \
-  ENABLE_IPV6="OFF" \
-  ENABLE_LIBASAN="OFF" \
-  ENABLE_SSL="ON" \
-  MANPAGES="ON" \
-  MYMPD_BUILDIR="build" \
-  DESTDIR="/app/dist" \
-  MYMPD_INSTALL_PREFIX="/usr" \
-  MPD_HOST="172.17.0.1" \
-  MPD_PORT="6600"
+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"
 
-RUN apk -U upgrade && \
-  apk add --no-cache \
-  cmake \
-  perl \
-  libid3tag-dev \
-  flac-dev \
-  lua5.4-dev \
-  alpine-sdk \
-  linux-headers \
-  pkgconf \
-  pcre2-dev \
-  jq \
-  g++ \
-  make \
-  libmpdclient-dev \
-  openssl-dev \
-  git \
-  abuild \
-  musl-dev
+ARG PACK_LIST="bash"
 
-RUN \
-  git clone https://github.com/jcorporation/myMPD ./ && \
-  bash ./build.sh installdeps && \
-  bash ./build.sh releaseinstall \
-  mkdir -p "$DESTDIR"
+ENV LANG=en_US.UTF-8 \
+  ENV=ENV=~/.bashrc \
+  TZ="America/New_York" \
+  SHELL="/bin/sh" \
+  TERM="xterm-256color" \
+  TIMEZONE="${TZ:-$TIMEZONE}" \
+  HOSTNAME="casjaysdev-ympd"
 
-COPY ./bin/. ${DESTDIR}/usr/local/bin/
+COPY ./rootfs/. /
 
-FROM casjaysdevdocker/alpine:latest
-ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')"
+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
 
-LABEL \
-  org.label-schema.name="ympd" \
-  org.label-schema.description="Web interface to mpd" \
-  org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/ympd" \
-  org.label-schema.vcs-url="https://github.com/casjaysdevdocker/ympd" \
-  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>"
+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
 
-RUN apk -U upgrade && \
-  apk add --no-cache \
-  libmpdclient \
-  openssl \
-  libid3tag \
-  flac \
-  lua5.4 \
-  pcre2 \
-  mpc \
-  mpd \
-  pulseaudio-utils
+FROM scratch
 
-RUN addgroup -S mympd 2>/dev/null && \
-  adduser -S -D -H -h /var/lib/mympd -s /sbin/nologin \
-  -G mympd -g myMPD mympd 2>/dev/null
+ARG \
+  SERVICE_PORT="80" \
+  EXPOSE_PORTS="80" \
+  PHP_SERVER="ympd" \
+  NODE_VERSION="system" \
+  NODE_MANAGER="system" \
+  BUILD_VERSION="latest" \
+  LICENSE="MIT" \
+  IMAGE_NAME="ympd" \
+  BUILD_DATE="Sun Nov 13 12:21:44 PM EST 2022" \
+  TIMEZONE="America/New_York"
 
-EXPOSE 8082 6600
-ENV HOSTNAME="ympd"
+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}" \
+  com.github.containers.toolbox="false"
 
-COPY --from=build /app/dist/. /
-COPY ./config/mpd.conf /etc/mpd.conf
-COPY ./config/mympd/. /var/lib/mympd/config/
-COPY ./config/pulse-client.conf /etc/pulse/client.conf
+ENV LANG=en_US.UTF-8 \
+  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" ]
 
-VOLUME [ "/config", "/var/lib/mpd", "/var/lib/mympd", "/music", "/playlists" ]
-HEALTHCHECK --interval=15s --timeout=3s CMD ["/usr/local/bin/entrypoint-ympd.sh", "healthcheck"]
-ENTRYPOINT ["/usr/local/bin/entrypoint-ympd.sh"]