Page MenuHomeDevCentral
Files F4792828

No OneTemporary
Actions

View Options

diff --git a/Dockerfile b/Dockerfile
index b5a9dca..28b779f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,118 +1,118 @@
#
# Nasqueron - Base nginx / php-fpm image
#
FROM debian:bullseye-slim
MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
#
# Prepare the container
#
ENV PHP_VERSION 7.4.27
ENV ONIGURAMA_VERSION=6.9.7.1
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
file \
libbz2-dev \
libzip-dev \
libcurl4-openssl-dev \
libjpeg-dev \
libpng-dev \
libxpm-dev \
libwebp-dev \
libfreetype6-dev \
libreadline6-dev \
libssl-dev \
libxslt1-dev \
libxml2-dev
ENV LANG C.UTF-8
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 gnupg \
runit nano less tmux wget git locales unzip \
$PHP_BUILD_DEPS $PHP_EXTRA_BUILD_DEPS \
--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 \
5A52880781F755608BF815FC910DEB46F53EA312 \
42670A7FE4D0441C8E4632349E4FDC074A4EF02D \
&& mkdir -p $PHP_INI_DIR/conf.d \
&& set -x \
&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
&& gpg --verify php.tar.bz2.asc \
&& mkdir -p /usr/src/php \
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
&& wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
&& mkdir /usr/src/onigurama \
&& cd /usr/src/onigurama \
&& tar xzf ../onigurama.tar.gz --strip-components=1 \
&& ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
&& export CPPFLAGS="$CFLAGS" \
&& export LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" \
&& ./configure \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
$PHP_EXTRA_CONFIGURE_ARGS \
--disable-cgi \
--enable-mysqlnd \
--enable-bcmath \
--with-bz2 \
--enable-calendar \
--with-curl \
--enable-gd \
--with-jpeg \
--with-freetype \
--with-xpm \
--with-webp \
--enable-exif \
--enable-ftp \
--with-libedit \
--enable-mbstring \
--with-mysqli \
--with-pdo-mysql \
--enable-pcntl \
--with-openssl \
--with-xsl \
--with-readline \
--with-zlib \
--with-zip \
--with-pear \
&& make -j"$(nproc)" \
&& make install \
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps \
&& make clean \
&& pecl install APCu \
&& cd /opt \
&& curl -sS https://getcomposer.org/installer | php \
&& ln -s /opt/composer.phar /usr/local/bin/composer
RUN groupadd -r app -g 433 && \
mkdir /home/app && \
mkdir -p /var/wwwroot/default && \
useradd -u 431 -r -g app -d /home/app -s /usr/sbin/nologin -c "Docker image user for web application" app && \
chown -R app:app /home/app /var/wwwroot/default && \
chmod 700 /home/app && \
chmod 711 /var/wwwroot/default
COPY files /
#
# Docker properties
#
VOLUME ["/var/wwwroot/default", "/etc/nginx"]
EXPOSE 80
EXPOSE 443
-CMD ["/usr/bin/runsvdir", "-P", "/etc/service"]
+CMD ["/usr/local/sbin/runsvdir-init"]
diff --git a/files/usr/local/sbin/runsvdir-init b/files/usr/local/sbin/runsvdir-init
new file mode 100755
index 0000000..783e3d0
--- /dev/null
+++ b/files/usr/local/sbin/runsvdir-init
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/runsvdir -P /etc/service
diff --git a/novolume/Dockerfile b/novolume/Dockerfile
index e851b3a..1f31d2f 100644
--- a/novolume/Dockerfile
+++ b/novolume/Dockerfile
@@ -1,115 +1,116 @@
#
# 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>
#
# Prepare the container
#
ENV PHP_VERSION 7.4.27
ENV ONIGURAMA_VERSION 6.9.7.1
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=app --with-fpm-group=app
ENV PHP_INI_DIR /usr/local/etc/php
ENV PHP_BUILD_DEPS bzip2 \
file \
libbz2-dev \
libzip-dev \
libcurl4-openssl-dev \
libjpeg-dev \
- libpng12-dev \
+ libpng-dev \
libxpm-dev \
libwebp-dev \
libfreetype6-dev \
libreadline6-dev \
libssl-dev \
libxslt1-dev \
libxml2-dev
ENV LANG C.UTF-8
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 \
5A52880781F755608BF815FC910DEB46F53EA312 \
42670A7FE4D0441C8E4632349E4FDC074A4EF02D \
&& mkdir -p $PHP_INI_DIR/conf.d \
&& set -x \
&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
&& gpg --verify php.tar.bz2.asc \
&& mkdir -p /usr/src/php \
&& tar -xof php.tar.bz2 -C /usr/src/php --strip-components=1 \
&& rm php.tar.bz2* \
&& wget -O /usr/src/onigurama.tar.gz https://github.com/kkos/oniguruma/releases/download/v$ONIGURAMA_VERSION/onig-$ONIGURAMA_VERSION.tar.gz \
&& mkdir /usr/src/onigurama \
&& cd /usr/src/onigurama \
&& tar xzf ../onigurama.tar.gz --strip-components=1 \
&& ./configure && make && make install \
&& cd /usr/src/php \
&& export CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
&& export CPPFLAGS="$CFLAGS" \
&& export LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" \
&& ./configure \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
$PHP_EXTRA_CONFIGURE_ARGS \
--disable-cgi \
--enable-mysqlnd \
--enable-bcmath \
--with-bz2 \
--enable-calendar \
--with-curl \
--enable-gd \
--with-jpeg \
--with-freetype \
--with-xpm \
--with-webp \
--enable-exif \
--enable-ftp \
--with-libedit \
--enable-mbstring \
--with-mysqli \
--with-pdo-mysql \
--enable-pcntl \
--with-openssl \
--with-xsl \
--with-readline \
--with-zlib \
--with-zip \
--with-pear \
&& make -j"$(nproc)" \
&& make install \
&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $buildDeps \
&& make clean \
&& pecl install APCu \
&& cd /opt \
&& curl -sS https://getcomposer.org/installer | php \
&& ln -s /opt/composer.phar /usr/local/bin/composer
RUN groupadd -r app -g 433 && \
mkdir /home/app && \
mkdir -p /var/wwwroot/default && \
useradd -u 431 -r -g app -d /home/app -s /usr/sbin/nologin -c "Docker image user for web application" app && \
chown -R app:app /home/app /var/wwwroot/default && \
chmod 700 /home/app && \
chmod 711 /var/wwwroot/default
COPY files /
#
# Docker properties
#
EXPOSE 80
EXPOSE 443
CMD ["/usr/local/sbin/runsvdir-init"]
diff --git a/novolume/files/etc/service/nginx/run b/novolume/files/etc/service/nginx/run
index 384d533..21060ee 100755
--- 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
index e440441..2dce83f 100755
--- 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
index 7c16fd2..783e3d0 100755
--- 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/x-diff
Expires
Fri, Feb 28, 21:20 (22 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2445175
Default Alt Text
(8 KB)

Event Timeline

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