Skip to content
Snippets Groups Projects
Commit 5de52a6f authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

stuff

parent 6aba4037
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 43 additions and 21 deletions
config/docker-files/7.2-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached & redis
RUN pecl install memcached redis \
......
config/docker-files/7.3-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached
RUN pecl install memcached redis \
......
config/docker-files/7.4-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached & redis
RUN pecl install memcached redis \
......
config/docker-files/8.0-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached & redis
RUN pecl install memcached redis \
......
config/docker-files/8.1-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached & redis
RUN pecl install memcached redis \
......
config/docker-files/8.2-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -14,6 +14,7 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
......@@ -28,7 +29,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached & redis
RUN pecl install memcached redis \
......
config/docker-files/8.3-Dockerfile
+ 2
− 1
View file @ 5de52a6f
......@@ -16,6 +16,7 @@ RUN apt update \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
locales \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
......@@ -30,7 +31,7 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached and redis
RUN pecl install memcached redis \
......
config/docker-files/8.4-Dockerfile
+ 5
− 6
View file @ 5de52a6f
FROM php:8.4.0alpha2-fpm
FROM php:8.4-rc-fpm
# Install system requirements
RUN apt update \
......@@ -16,6 +16,7 @@ RUN apt update \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxslt-dev \
libxml2-dev \
locales \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
......@@ -30,13 +31,11 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
# Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
# Install Memcached and redis
# RUN pecl install memcached redis \
# && docker-php-ext-enable memcached redis
RUN pecl install memcached \
&& docker-php-ext-enable memcached
RUN pecl install memcached redis \
&& docker-php-ext-enable memcached redis
# Cleanup
RUN docker-php-source delete \
......
config/nginx-php.conf
+ 1
− 0
View file @ 5de52a6f
......@@ -8,4 +8,5 @@ location ~ \.php(?:$|/) {
fastcgi_param DOCUMENT_ROOT $site_document_root;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_read_timeout 1200;
}
config/php-fpm.conf
+ 1
− 0
View file @ 5de52a6f
......@@ -2,3 +2,4 @@ php_admin_flag[log_errors] = on
php_admin_value[error_log] = /var/log/error.log
access.log = /dev/null
pm.max_requests = 500
request_terminate_timeout = 900
\ No newline at end of file
config/php.ini
+ 4
− 3
View file @ 5de52a6f
max_input_vars=10000
max_execution_time=300
upload_max_filesize=8M
post_max_size=9M
max_execution_time=1200
max_file_uploads = 256
upload_max_filesize=200M
post_max_size=200M
error_reporting=22519
zend_extension=opcache.so
......
lib/Commands/Compile.php
+ 15
− 4
View file @ 5de52a6f
......@@ -163,6 +163,15 @@ final class Compile extends Command
),
]);
// DB
$creator->addService('db', 'mariadb:latest', [
'container_name' => 'db',
'networks' => ['code-network'],
'environment' => [
'MARIADB_RANDOM_ROOT_PASSWORD' => true,
],
]);
$mounts = [
"{$compiledPath}/nginx.conf" => 'conf.d/default.conf',
"{$compiledPath}/nginx-sites.conf" => 'sites.conf',
......@@ -195,6 +204,7 @@ final class Compile extends Command
'MYSQL_HOST' => 'host.docker.internal',
],
'networks' => ['code-network'],
'depends_on' => ['db'],
]);
$creator->addServiceVolume(
......@@ -246,9 +256,10 @@ final class Compile extends Command
'server_name _',
'proxy_read_timeout' => 300,
'proxy_connect_timeout' => 300,
'proxy_send_timeout' => 300,
'proxy_read_timeout 1200',
'proxy_connect_timeout 1200',
'proxy_send_timeout 1200',
'send_timeout 1200',
'access_log off',
'error_log off',
......@@ -283,7 +294,7 @@ final class Compile extends Command
]);
$creator->addServer([
'listen ' . $sslPort . ' default_server ssl',
'listen ' . $sslPort . ' default_server ssl http2',
'client_max_body_size 64M',
'set $fastcgi_backend ' . $index . '_backend',
......
lib/Creators/NginxConfiguration.php
+ 3
− 1
View file @ 5de52a6f
......@@ -9,7 +9,7 @@ final class NginxConfiguration extends ConfigurationCreator
public function addLocation(string $location, array $config, string $modifier = '^~')
{
$this->addConfiguration('location', [
'location' => $location = '/' . ltrim($location, '/'),
'location' => '/' . ltrim($location, '/'),
'modifier' => $modifier,
'config' => $config,
]);
......@@ -17,6 +17,8 @@ final class NginxConfiguration extends ConfigurationCreator
public function addServer(array $config)
{
$this->addConfiguration('server', [
'config' => $config,
]);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment