diff --git a/Dockerfile b/Dockerfile index 9d36e6b9..f96901a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.2-fpm-alpine -RUN apk --no-cache add nginx supervisor curl subversion mercurial \ +RUN apk --no-cache add nginx curl subversion \ git bash openssh-client zip unzip redis shadow && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ printf "Host *\n StrictHostKeyChecking no" > /etc/ssh/ssh_config @@ -37,6 +37,8 @@ RUN set -eux; \ \ apk del --no-network .build-deps; +COPY --from=ochinchina/supervisord:latest /usr/local/bin/supervisord /usr/bin/supervisord + WORKDIR /var/www/packagist COPY composer.json composer.lock /var/www/packagist/ @@ -78,4 +80,4 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] EXPOSE 80 -CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisord.conf"] +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] diff --git a/docker/php/supervisord.conf b/docker/php/supervisord.conf index abbd4940..b8ce20f0 100644 --- a/docker/php/supervisord.conf +++ b/docker/php/supervisord.conf @@ -3,7 +3,6 @@ nodaemon=true logfile=/var/log/supervisord.log; pidfile=/run/supervisord.pid loglevel=info -port=127.0.0.1:9001 [include] files = /etc/supervisor.d/*.conf @@ -12,11 +11,5 @@ files = /etc/supervisor.d/*.conf file=/var/run/supervisor.sock ; (the path to the socket file) chmod=0700 ; sockef file mode (default 0700) -[supervisorctl] -serverurl=http://127.0.0.1:9001 - -[inet_http_server] -port = 127.0.0.1:9001 - [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface