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

wip

parent 107d460f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 104 additions and 18 deletions
config/docker-files/7.2-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/7.3-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/7.4-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/8.0-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/8.1-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/8.2-Dockerfile
+ 4
− 2
View file @ 3d034e42
......@@ -20,8 +20,10 @@ RUN apt update && apt install -y --no-install-recommends \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/8.3-Dockerfile
+ 5
− 2
View file @ 3d034e42
......@@ -5,6 +5,7 @@ RUN apt update \
&& apt install -y --no-install-recommends \
default-mysql-client \
default-libmysqlclient-dev \
git \
imagemagick ghostscript \
zlib1g-dev \
libjpeg-dev \
......@@ -21,8 +22,10 @@ RUN apt update \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install de_DE locale
RUN locale-gen de_DE.UTF-8 \
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# Install php extensions
......
config/docker-files/8.4-Dockerfile 0 → 100644
+ 47
− 0
View file @ 3d034e42
FROM php:8.4.0alpha2-fpm
# Install system requirements
RUN apt update \
&& apt install -y --no-install-recommends \
default-mysql-client \
default-libmysqlclient-dev \
git \
imagemagick ghostscript \
zlib1g-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libwebp-dev \
libonig-dev \
libzip-dev \
libicu-dev \
libfreetype6-dev \
libxml2-dev \
locales \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
vim \
&& rm -rf /var/lib/apt/lists/*
# Install locales
RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
&& sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
&& dpkg-reconfigure --frontend=noninteractive locales \
&& update-locale
# 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
# Install Memcached and redis
# RUN pecl install memcached redis \
# && docker-php-ext-enable memcached redis
RUN pecl install memcached \
&& docker-php-ext-enable memcached
# Cleanup
RUN docker-php-source delete \
&& apt-get autoremove --purge -y && apt-get autoclean -y && apt-get clean -y
# Enable PS in gs
RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
/etc/ImageMagick-6/policy.xml
lib/Commands/Compile.php
+ 2
− 0
View file @ 3d034e42
......@@ -278,11 +278,13 @@ final class Compile extends Command
foreach ($servers as [$index, $port, $sslPort]) {
$creator->addServer([
'listen ' . $port . ' default_server',
'client_max_body_size 64M',
'set $fastcgi_backend ' . $index . '_backend',
]);
$creator->addServer([
'listen ' . $sslPort . ' default_server ssl',
'client_max_body_size 64M',
'set $fastcgi_backend ' . $index . '_backend',
'ssl_certificate /etc/nginx/ssl.crt',
......
lib/Commands/PHP/Enable.php
+ 1
− 1
View file @ 3d034e42
......@@ -42,7 +42,7 @@ final class Enable extends Command
$php[$version] = $port;
$config->set('php', $php);
$io->success("PHP version {$version} has been enabled on port {$port}");
$io->success("PHP version {$version} has been enabled on ports {$port[0]} and {$port[1]}");
$enabled += 1;
}
......
lib/DockerComposeCommand.php
+ 3
− 1
View file @ 3d034e42
......@@ -22,11 +22,13 @@ abstract class DockerComposeCommand extends Command
protected function createDockerComposeCommand(array $command): Process
{
return new Process([
$process = new Process([
'docker', 'compose',
'-f', self::GetCompiledPath() . '/docker-compose.yml',
...$command,
]);
$process->setTimeout(null);
return $process;
}
......
lib/SupportedPHPVersions.php
+ 1
− 0
View file @ 3d034e42
......@@ -11,6 +11,7 @@ final class SupportedPHPVersions
'8.1' => [8081, 8881],
'8.2' => [8082, 8882],
'8.3' => [8083, 8883],
'8.4' => [8084, 8884],
];
private const DEFAULT = ['7.4', '8.1', '8.3'];
......
web/assets/style.css
+ 21
− 2
View file @ 3d034e42
:root {
--background-color: #ffffff;
--hover-background-color: #ffeecc;
--text-color: #000000;
}
@media (prefers-color-scheme: dark) {
:root {
--background-color: #000000;
--hover-background-color: #001133;
--text-color: #ffffff;
}
}
body {
background-color: var(--background-color);
color: var(--text-color);
}
.tabs {
background-color: #fff;
background-color: inherit;
border-bottom: 1px solid #ccc;
font-size: 1.5em;
line-height: 1.5em;
......@@ -32,5 +51,5 @@ th {
text-align: left;
}
tr:hover td {
background-color: #fec;
background-color: var(--hover-background-color);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment