🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2023-01-08 11:19:25 -05:00
parent fa2baa3d63
commit 60071edc86
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F

View File

@ -1,4 +1,4 @@
FROM casjaysdevdocker/python2:latest AS build
FROM casjaysdevdocker/alpine:latest AS build
ARG ALPINE_VERSION="v3.16"
@ -6,17 +6,17 @@ 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="bash alpine-sdk autoconf musl-dev automake gettext git libtool \
openssl openssl-dev linux-headers rrdtool ffmpeg-dev geoip-dev php8-cgi"
ARG PACK_LIST="bash"
ENV LANG=en_US.utf8 \
ENV LANG=en_US.UTF-8 \
ENV=ENV=~/.bashrc \
TZ="America/New_York" \
SHELL="/bin/sh" \
TERM="xterm-256color" \
TIMEZONE="${TZ:-$TIMEZONE}" \
HOSTNAME="casjaysdev-cherokee" \
CFLAGS="-static"
HOSTNAME="casjaysdev-cherokee"
COPY ./rootfs/. /
RUN set -ex; \
rm -Rf "/etc/apk/repositories"; \
@ -27,40 +27,6 @@ RUN set -ex; \
apk update --update-cache && apk add --no-cache ${PACK_LIST} && \
echo
WORKDIR /tmp/build
RUN mkdir -p "/usr/local/share/template-files/config/defaults/cherokee" "/buildroot" && \
cd /tmp/build && \
git clone https://github.com/cherokee/webserver.git . && \
/usr/bin/libtoolize && \
aclocal && autoheader && touch ./ChangeLog ./README && autoconf && \
./autogen.sh --prefix=/usr/local/share/cherokee --sysconfdir=/etc/cherokee --localstatedir=/tmp/cherokee --enable-static-module=all --enable-static --enable-shared=no && \
autoreconf -iv && \
make && make install && \
echo "<p style='text-align:center'>Built from $(git rev-parse --short HEAD) on $(date)</p>" > ./version.txt && \
apk del --no-cache \
alpine-sdk \
autoconf \
automake \
gettext \
openssl-dev \
linux-headers \
ffmpeg-dev \
geoip-dev \
libtool && \
openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=US/ST=CA/L=CA/O=Cherokee/OU=Cherokee/CN=localhost" -keyout /etc/ssl/server.key -out /etc/ssl/server.key && \
ln -sf /usr/local/share/cherokee/bin/* /usr/local/bin/ && \
ln -sf /usr/local/share/cherokee/sbin/* /usr/local/bin/ && \
cp -Rf "/etc/cherokee/." "/usr/local/share/template-files/config/defaults/cherokee/" && \
cp -Rf "/usr/local/." "/buildroot/"
FROM casjaysdevdocker/php:latest AS php
RUN apk add --no-cache geoip rrdtool openssl
COPY ./rootfs/. /
COPY --from=build /buildroot/. /usr/local/
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/* ; \
@ -77,14 +43,14 @@ FROM scratch
ARG \
SERVICE_PORT="80" \
EXPOSE_PORTS="80 9090" \
EXPOSE_PORTS="80" \
PHP_SERVER="cherokee" \
NODE_VERSION="system" \
NODE_MANAGER="system" \
BUILD_VERSION="latest" \
LICENSE="MIT" \
IMAGE_NAME="cherokee" \
BUILD_DATE="Thu Oct 20 04:49:27 PM EDT 2022" \
BUILD_DATE="Sun Nov 13 12:16:01 PM EST 2022" \
TIMEZONE="America/New_York"
LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>" \
@ -102,9 +68,10 @@ 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.utf8 \
ENV LANG=en_US.UTF-8 \
ENV=~/.bashrc \
SHELL="/bin/bash" \
PORT="${SERVICE_PORT}" \
@ -115,10 +82,10 @@ ENV LANG=en_US.utf8 \
TIMEZONE="${TZ:-$TIMEZONE}" \
HOSTNAME="casjaysdev-${IMAGE_NAME}"
COPY --from=php /. /
COPY --from=build /. /
USER root
WORKDIR /data/htdocs/www
WORKDIR /root
VOLUME [ "/config","/data" ]
@ -127,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" ]