Merge pull request #5 from Tinywan/feature/s6-overlay

Feature/s6 overlay

Author: Tinywan

Dockerfile

@@ -1,13 +1,14 @@
-FROM php:8.3.30-cli-alpine
+FROM php:8.4.17-cli-alpine
+ARG S6_OVERLAY_VERSION=3.2.1.0
 
 LABEL Maintainer="ShaoBo Wan (Tinywan) <756684177@qq.com>" \
-    Description="Webman Lightweight container with PHP 8.4.16 based on Alpine Linux."
+    Description="Webman Lightweight container with PHP 8.4.16 based on Alpine Linux with S6 Overlay."
 
 # Use Alibaba Cloud mirror for faster downloads
 RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories
 
 # Install runtime dependencies only (build deps will be installed and removed later)
-RUN apk add --no-cache curl ca-certificates tzdata supervisor
+RUN apk add --no-cache curl ca-certificates tzdata
 
 COPY ./extension /tmp/extension
 WORKDIR /tmp/extension
@@ -24,22 +25,35 @@ RUN apk add --no-cache --virtual .build-deps \
     && rm -rf /var/cache/apk /tmp/* /root/.pearrc /usr/local/include/php \
     && mkdir -p /var/cache/apk
 
-# Add Composer (with cache cleanup)
+# Add Composer (with cache cleanup, no plugins/scripts)
 RUN curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/composer \
-    && rm -rf /root/.composer/cache
+    && composer --version \
+    && rm -rf /root/.composer/cache /tmp/*
 
 # Configure PHP
 COPY config/php.ini /usr/local/etc/php/conf.d/zzz_custom.ini
 
-# Configure supervisord
-COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
 # Setup document root
 RUN mkdir -p /app
 
+# Add entrypoint script for auto composer install
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Install S6 Overlay v3 (download, extract, cleanup in one layer)
+RUN apk add --no-cache curl \
+    && curl -fsSL https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz -o /tmp/s6-overlay-noarch.tar.xz \
+    && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \
+    && curl -fsSL https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz -o /tmp/s6-overlay-x86_64.tar.xz \
+    && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz \
+    && rm -f /tmp/s6-overlay-*.tar.xz \
+    && apk del curl
+
+# Use S6 Overlay as init system with environment to override services
 VOLUME /app
 WORKDIR /app
 EXPOSE 8787
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD ["php", "start.php","start"]

README.md

@@ -6,7 +6,7 @@
 ## Build
 
 ```
-docker build -t tinywan/docker-php-webman:8.4.16 .
+docker build -t tinywan/docker-php-webman:8.4.15-cli-alpine .
 ```
 ## Usage
 
@@ -22,6 +22,7 @@ docker run --rm -it -p 8787:8787 -v /home/www/webman:/app tinywan/docker-php-web
 
 ```
 docker run --rm -it -p 8787:8787 -v e:/dnmp/www/webman:/app tinywan/docker-php-webman
+docker run --rm -it -p 8780:8787 -v e:/dnmp/www/webman/video.webman.tinywan.com:/app tinywan/docker-php-webman:8.4.15-cli-alpine
 ```
 
 Test Run

entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+cd /app
+
+# Auto install dependencies if vendor/autoload.php not exists
+if [ ! -f vendor/autoload.php ]; then
+    echo "Composer dependencies not found, installing..."
+    composer install --no-interaction --no-scripts --no-plugins
+fi
+
+# Execute s6-overlay init then the command
+exec /init "$@"

extension/install.sh

@@ -682,4 +682,5 @@ fi
 
 # Cleanup build artifacts and caches
 echo "---------- Cleanup ----------"
+rm -rf /tmp/* /var/cache/apk/* /root/.pearrc /usr/local/include/php /root/.cache/pecl
 docker-php-source delete