From a296fa6881147bb1d7775bd68f7fcc559588fd2b Mon Sep 17 00:00:00 2001 From: Uladzimir Tsykun Date: Thu, 28 Sep 2023 00:29:33 +0200 Subject: [PATCH 1/2] Remove python from docker image --- Dockerfile | 6 ++++-- docker-compose.yml | 2 +- docker/php/supervisord.conf | 7 ------- 3 files changed, 5 insertions(+), 10 deletions(-) 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-compose.yml b/docker-compose.yml index eb2983f2..4ecc5d15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: # ADMIN_EMAIL: admin@example.com TRUSTED_PROXIES: 172.16.0.0/12 # Default SQLite - DATABASE_URL: "mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4" +# DATABASE_URL: "mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4" # MAILER_DSN: smtp://user:pass@smtp.mailgun.org:587 # MAILER_FROM: Packeton 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 From 5831d87a7be18e53aa7789fd030b3761a67431f9 Mon Sep 17 00:00:00 2001 From: Uladzimir Tsykun Date: Thu, 28 Sep 2023 00:33:30 +0200 Subject: [PATCH 2/2] Remove python from docker image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4ecc5d15..eb2983f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: # ADMIN_EMAIL: admin@example.com TRUSTED_PROXIES: 172.16.0.0/12 # Default SQLite -# DATABASE_URL: "mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4" + DATABASE_URL: "mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4" # MAILER_DSN: smtp://user:pass@smtp.mailgun.org:587 # MAILER_FROM: Packeton