diff --git a/docker-compose.yml b/docker-compose.yml index fbc1a195505ac4504ac865a3ed71f66964ee8b99..f53ac7aa6cd8423c0a95eff6527f24ab093436b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,9 @@ services: - "8073:89" networks: - code-network + depends_on: + - redis-server + - memcached-server volumes: - ./config/nginx.conf:/etc/nginx/conf.d/default.conf - ./config/nginx-sites.conf:/etc/nginx/sites.conf @@ -20,6 +23,14 @@ services: - ./data:/var/www/html - ~/Code/studip:/var/www/html/studip:ro - ./logs/nginx:/var/log/nginx/ + redis-server: + image: redis:latest + networks: + - code-network + memcached-server: + image: memcached:latest + networks: + - code-network php74: &base-php build: context: . diff --git a/php/7.2-Dockerfile b/php/7.2-Dockerfile index b43108441c3918f62c1ee9facf0f97b0ea803270..5221f9f4b394a609e87504b1b80740c7091788c2 100644 --- a/php/7.2-Dockerfile +++ b/php/7.2-Dockerfile @@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # 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) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached & redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/7.3-Dockerfile b/php/7.3-Dockerfile index 16d257ecd169fb55598f4e1fb69ac240987821b6..d3cebfd8db98b1ca6f867f9299a728f72847a60c 100644 --- a/php/7.3-Dockerfile +++ b/php/7.3-Dockerfile @@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # 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) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* +RUN locale-gen de_DE.UTF-8 \ + && update-locale # Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached - -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/7.4-Dockerfile b/php/7.4-Dockerfile index 6982eb4002df33c56955a52c60a9aaa9e1ed92a7..969639f8fb084c8ebe2ba4c3b93d7529a3d7ebff 100644 --- a/php/7.4-Dockerfile +++ b/php/7.4-Dockerfile @@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # Install php extensions RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp -RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached & redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/8.0-Dockerfile b/php/8.0-Dockerfile index 12ac368c2b791dac405af0fb500c53bde64d7520..f3e1985f1bc5286eba4cc6d64f3692eed72b7a0d 100644 --- a/php/8.0-Dockerfile +++ b/php/8.0-Dockerfile @@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # Install php extensions RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp -RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl - -# Install php-soap -RUN apt update \ - && apt install -y --no-install-recommends libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached & redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/8.1-Dockerfile b/php/8.1-Dockerfile index 4c6e00da68ce940397b67080b6ca3b730a2a0f42..728de5640a90c968b1f0ede980323aa7947b5c83 100644 --- a/php/8.1-Dockerfile +++ b/php/8.1-Dockerfile @@ -13,34 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # Install php extensions RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp -RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached - +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached & redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/8.2-Dockerfile b/php/8.2-Dockerfile index 4bcd9f2b25584ffb9aebd53f34cad07298262be6..009ea675d46f59376f0387e0acd55e779a67a601 100644 --- a/php/8.2-Dockerfile +++ b/php/8.2-Dockerfile @@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ libzip-dev \ libicu-dev \ libfreetype6-dev \ + libxml2-dev \ + libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ + locales \ vim \ && rm -rf /var/lib/apt/lists/* # Install php extensions RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp -RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached & redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis diff --git a/php/8.3-Dockerfile b/php/8.3-Dockerfile index 17bddb2c5bb6c0c213e84cdd6309f34288de6568..465b488757443417ee53cd14e97e4f027606a433 100644 --- a/php/8.3-Dockerfile +++ b/php/8.3-Dockerfile @@ -1,7 +1,8 @@ FROM php:8.3-fpm # Install system requirements -RUN apt update && apt install -y --no-install-recommends \ +RUN apt update \ + && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ libcurl4-openssl-dev zlib1g-dev \ @@ -13,33 +14,20 @@ RUN apt update && apt install -y --no-install-recommends \ 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 php extensions RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp -RUN docker-php-ext-install -j$(nproc) curl gd gettext intl mbstring mysqli pdo pdo_mysql pdo_pgsql zip - -# Install php-soap -RUN apt update \ - && apt install -y libxml2-dev \ - && rm -rf /var/lib/apt/lists/* -RUN docker-php-ext-install soap +RUN docker-php-ext-install -j$(nproc) curl gd gettext intl mbstring mysqli pdo pdo_mysql pdo_pgsql soap zip # Install de_DE locale -RUN apt update \ - && apt install -y --no-install-recommends locales \ - && locale-gen de_DE \ - && update-locale \ - && rm -rf /var/lib/apt/lists/* - -# Install Memcached -RUN apt update \ - && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pecl install memcached \ - && docker-php-ext-enable memcached +RUN locale-gen de_DE.UTF-8 \ + && update-locale -# Install redis -RUN pecl install redis \ - && docker-php-ext-enable redis +# Install Memcached and redis +RUN pecl install memcached redis \ + && docker-php-ext-enable memcached redis