small refactor

docker/Dockerfile

@@ -1,4 +1,6 @@
-# docker build -t phpmyadmin-fpm-alpine-caddy --build-arg BUILDKIT_INLINE_CACHE=1 -f ./docker/Dockerfile . && docker run --rm -it -p 8080:80 phpmyadmin-fpm-alpine-caddy
+# syntax=docker/dockerfile:1
+# Author: Alexander Tebiev - https://github.com/beeyev/phpmyadmin-docker-lightweight
+# docker buildx build --build-arg=BASE_IMAGE_VERSION=5.2-fpm-alpine --cache-to=type=inline --pull --tag phpmyadmin-fpm-alpine-caddy --file ./docker/Dockerfile ./ && docker run -p 9090:80 -it --rm phpmyadmin-fpm-alpine-caddy
 ARG BASE_IMAGE_VERSION
 FROM phpmyadmin:${BASE_IMAGE_VERSION} as phpmyadmin
 
@@ -9,7 +11,10 @@ RUN set -eux \
       curl \
       unzip \
     && curl -fsSL https://github.com/phpmyadmin/themes/archive/refs/heads/master.zip --output /src/phpmyadmin-themes.zip \
-    && unzip -uoq /src/phpmyadmin-themes.zip -d /src/
+    && unzip -uoq /src/phpmyadmin-themes.zip -d /src/ \
+    && mkdir /src/selected-themes/ \
+    && cp -r /src/themes-master/blueberry/ /src/themes-master/boodark/ -t /src/selected-themes/
+
 
 FROM phpmyadmin
 
@@ -19,8 +24,8 @@ LANG="en_US.UTF-8" \
 LC_TIME="en_DK.UTF-8" \
 TIME_STYLE="long-iso"
 
-RUN set -eux \
-  && apk add --quiet --no-cache \
+RUN --mount=type=cache,sharing=locked,target=/var/cache/apk/ set -eux \
+  && apk add --quiet --update --no-cache \
     iputils \
     # `fcgi` - Healthcheck |  https://github.com/renatomefi/php-fpm-healthcheck
     fcgi \
@@ -29,27 +34,26 @@ RUN set -eux \
 # Caddy | https://caddyserver.com/
 COPY --from=caddy:2-alpine /usr/bin/caddy /usr/local/bin/caddy
 COPY ./docker/config/caddy/Caddyfile /etc/caddy/Caddyfile
+ENV ACME_AGREE=true
 RUN set -eux \
-#    && setcap 'cap_net_bind_service=+ep' /usr/local/bin/caddy \
-    && caddy fmt --overwrite /etc/caddy/Caddyfile \
+    && caddy validate --config /etc/caddy/Caddyfile \
     && caddy version
 
-# Healthcheck | https://github.com/renatomefi/php-fpm-healthcheck
+## Healthcheck |  https://github.com/renatomefi/php-fpm-healthcheck
+ADD --chmod=0705 --link https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck /usr/local/bin/php-fpm-healthcheck
 RUN set -eux \
-    && curl -fsSL https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck --output /usr/local/bin/php-fpm-healthcheck \
-    && chmod +x /usr/local/bin/php-fpm-healthcheck \
     && echo "pm.status_path = /status" >> /usr/local/etc/php-fpm.d/zz-docker.conf
-HEALTHCHECK --interval=1m --timeout=1s --start-period=10s CMD (curl --fail http://localhost/LICENSE && php-fpm-healthcheck) || exit 1
+# Cheching Caddy & php-fpm
+HEALTHCHECK --interval=1m --timeout=1s --start-period=10s CMD (curl --fail http://localhost:9999/health && php-fpm-healthcheck) || exit 1
 
 COPY ./docker/config/php-fpm.d/zzz-php-fpm_custom.conf /usr/local/etc/php-fpm.d/zzz-php-fpm_custom.conf
 
 # Install themes
-COPY --from=phpmyadmin-themes /src/themes-master/blueberry/ /var/www/html/themes/blueberry/
-COPY --from=phpmyadmin-themes /src/themes-master/boodark/ /var/www/html/themes/boodark/
+COPY --from=phpmyadmin-themes /src/selected-themes/ /var/www/html/themes/
 
 LABEL org.opencontainers.image.title="phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, PHP FPM and Caddy" \
-    org.opencontainers.image.authors="https://github.com/beeyev/phpmyadmin-docker-lightweight" \
+    org.opencontainers.image.authors="https://github.com/beeyev/" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/beeyev/phpmyadmin-docker-lightweight" \
     org.opencontainers.image.url="https://github.com/beeyev/phpmyadmin-docker-lightweight" \
@@ -59,15 +63,15 @@ ARG TZ='UTC'
 ENV TZ=$TZ
 
 #These params meant to be set by CI
-ARG IMAGE_TAG
-ENV IMAGE_TAG=$IMAGE_TAG
-RUN echo $IMAGE_TAG
-ARG BUILD_DATE
+ARG BUILD_DATE=undefined
 ENV BUILD_DATE=$BUILD_DATE
 RUN echo $BUILD_DATE
-ARG BUILD_FINGERPRINT
+ARG BUILD_FINGERPRINT=undefined
 ENV BUILD_FINGERPRINT=$BUILD_FINGERPRINT
 RUN echo $BUILD_FINGERPRINT
+ARG BRANCH_NAME=undefined
+ENV BRANCH_NAME=$BRANCH_NAME
+RUN echo $BRANCH_NAME
 
 RUN set -eux \
     && mv /docker-entrypoint.sh /phpmyadmin-docker-entrypoint.sh
@@ -75,4 +79,3 @@ RUN set -eux \
 COPY --chmod=0755 ./docker/etc/docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 EXPOSE 80
-

docker/config/caddy/Caddyfile

@@ -15,6 +15,6 @@
 	php_fastcgi 127.0.0.1:9000 {
 		trusted_proxies 0.0.0.0/0
 	}
-	file_server browse
+	file_server
 	encode zstd gzip
 }

docker/etc/docker-entrypoint.sh

@@ -20,9 +20,16 @@ for f in /docker-entrypoint.init.d/*; do
     esac
 done
 
-printf "\n${GRN}--->${NC} 	🚀️️	 Welcome to ${GRN}beeyev phpMyAdmin v.${VERSION} lightweight${NC} container..."
+printf "\n${GRN}--->${NC} 🚀  Starting ${GRN}beeyev phpMyAdmin v.${VERSION} lightweight${NC} container..."
 printf "\n${GRN}--->${NC} Docker image build date: ${GRN}${BUILD_DATE}${NC}, fingerprint: ${GRN}${BUILD_FINGERPRINT}${NC}"
-printf "\n${GRN}--->${NC} Subscribe to project updates: ${GRN}https://github.com/beeyev/phpmyadmin-docker-lightweight${NC}\n\n"
+printf "\n${GRN}--->${NC} Subscribe to the project updates: ${GRN}https://github.com/beeyev/phpmyadmin-docker-lightweight${NC}"
+
+printf "\n\nCaddy version:\n"
+caddy version
+
+printf "\nPHP-FPM version:\n"
+php-fpm --version
+printf "\n"
 
 caddy start --adapter caddyfile --config /etc/caddy/Caddyfile