Page MenuHomeDevCentral
Files F3716689

D2523.id6361.diff
No OneTemporary
Actions

D2523.id6361.diff
View Options

diff --git a/novolume/Dockerfile b/novolume/Dockerfile
--- a/novolume/Dockerfile
+++ b/novolume/Dockerfile
@@ -2,7 +2,7 @@
# Nasqueron - Base nginx / php-fpm image
#
-FROM debian:jessie
+FROM debian:bullseye-slim
MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
#
@@ -19,7 +19,7 @@
libzip-dev \
libcurl4-openssl-dev \
libjpeg-dev \
- libpng12-dev \
+ libpng-dev \
libxpm-dev \
libwebp-dev \
libfreetype6-dev \
@@ -31,10 +31,11 @@
RUN apt-get update && apt-get install -y ca-certificates curl libxml2 autoconf \
libedit-dev libsqlite3-dev xz-utils \
- gcc libc-dev make pkg-config nginx-full \
+ gcc libc-dev make pkg-config nginx-full gnupg \
runit nano less tmux wget git locales unzip \
$PHP_BUILD_DEPS $PHP_EXTRA_BUILD_DEPS \
- --no-install-recommends && rm -r /var/lib/apt/lists/* \
+ --no-install-recommends && apt-get autoremove -y && apt-get clean && \
+ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& dpkg-reconfigure locales
RUN gpg --keyserver keyserver.ubuntu.com --recv-keys \
@@ -112,4 +113,4 @@
EXPOSE 80
EXPOSE 443
-CMD ["/usr/local/sbin/runsvdir-init"]
+CMD ["/usr/bin/runsvdir", "-P", "/etc/service"]
diff --git a/novolume/files/etc/service/nginx/run b/novolume/files/etc/service/nginx/run
--- a/novolume/files/etc/service/nginx/run
+++ b/novolume/files/etc/service/nginx/run
@@ -1,4 +1,3 @@
#!/bin/bash
exec 2>&1
-source /usr/local/etc/envvars
exec /usr/sbin/nginx
diff --git a/novolume/files/etc/service/php-fpm/run b/novolume/files/etc/service/php-fpm/run
--- a/novolume/files/etc/service/php-fpm/run
+++ b/novolume/files/etc/service/php-fpm/run
@@ -1,5 +1,4 @@
#!/bin/bash
exec 2>&1
-source /usr/local/etc/envvars
php-fpm-env > /usr/local/etc/php-fpm-env.conf
exec /usr/local/sbin/php-fpm --nodaemonize
diff --git a/novolume/files/usr/local/sbin/runsvdir-init b/novolume/files/usr/local/sbin/runsvdir-init
--- a/novolume/files/usr/local/sbin/runsvdir-init
+++ b/novolume/files/usr/local/sbin/runsvdir-init
@@ -1,3 +1,2 @@
-#!/bin/bash
-export > /usr/local/etc/envvars
-exec /usr/sbin/runsvdir-start
+#!/bin/sh
+/usr/bin/runsvdir -P /etc/service

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 6, 18:09 (14 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2232164
Default Alt Text
D2523.id6361.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator