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

simplify docker files

parent 2de04605
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,9 @@ services: ...@@ -13,6 +13,9 @@ services:
- "8073:89" - "8073:89"
networks: networks:
- code-network - code-network
depends_on:
- redis-server
- memcached-server
volumes: volumes:
- ./config/nginx.conf:/etc/nginx/conf.d/default.conf - ./config/nginx.conf:/etc/nginx/conf.d/default.conf
- ./config/nginx-sites.conf:/etc/nginx/sites.conf - ./config/nginx-sites.conf:/etc/nginx/sites.conf
...@@ -20,6 +23,14 @@ services: ...@@ -20,6 +23,14 @@ services:
- ./data:/var/www/html - ./data:/var/www/html
- ~/Code/studip:/var/www/html/studip:ro - ~/Code/studip:/var/www/html/studip:ro
- ./logs/nginx:/var/log/nginx/ - ./logs/nginx:/var/log/nginx/
redis-server:
image: redis:latest
networks:
- code-network
memcached-server:
image: memcached:latest
networks:
- code-network
php74: &base-php php74: &base-php
build: build:
context: . context: .
......
...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir 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 RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached & redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir 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 RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& locale-gen de_DE \
&& update-locale \
&& rm -rf /var/lib/apt/lists/*
# Install Memcached # Install Memcached
RUN apt update \ RUN pecl install memcached redis \
&& apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \ && docker-php-ext-enable memcached redis
&& 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
...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp 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 RUN docker-php-ext-install -j$(nproc) gettext curl gd mbstring zip pdo pdo_mysql pdo_pgsql mysqli intl json soap
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached & redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp 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 RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap
# 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
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached & redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
...@@ -13,34 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,34 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp 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 RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached & redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +13,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
locales \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp 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 RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo_mysql pdo_pgsql mysqli intl soap
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached & redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
FROM php:8.3-fpm FROM php:8.3-fpm
# Install system requirements # 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-mysql-client \
default-libmysqlclient-dev \ default-libmysqlclient-dev \
libcurl4-openssl-dev zlib1g-dev \ libcurl4-openssl-dev zlib1g-dev \
...@@ -13,33 +14,20 @@ RUN apt update && apt install -y --no-install-recommends \ ...@@ -13,33 +14,20 @@ RUN apt update && apt install -y --no-install-recommends \
libzip-dev \ libzip-dev \
libicu-dev \ libicu-dev \
libfreetype6-dev \ libfreetype6-dev \
libxml2-dev \
locales \
libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
vim \ vim \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install php extensions # Install php extensions
RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp 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 RUN docker-php-ext-install -j$(nproc) curl gd gettext intl mbstring mysqli pdo pdo_mysql pdo_pgsql soap zip
# Install php-soap
RUN apt update \
&& apt install -y libxml2-dev \
&& rm -rf /var/lib/apt/lists/*
RUN docker-php-ext-install soap
# Install de_DE locale # Install de_DE locale
RUN apt update \ RUN locale-gen de_DE.UTF-8 \
&& apt install -y --no-install-recommends locales \ && update-locale
&& 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
# Install redis # Install Memcached and redis
RUN pecl install redis \ RUN pecl install memcached redis \
&& docker-php-ext-enable redis && docker-php-ext-enable memcached redis
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment