Commit 3c5cca83 authored by Manuel Christlieb's avatar Manuel Christlieb

feat(): Add bz2 to all images and add ssmtp via buster-packports in 7.4 image

parent 3ddb0373
Pipeline #28306 failed with stage
in 7 minutes and 38 seconds
......@@ -13,11 +13,11 @@ RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/s
# Install packages with clean up
RUN set -ex; \
build_dependencies="autoconf dpkg-dev file g++ gcc make pkgconf re2c libcurl4-nss-dev \
libbz2-dev libxml2-dev libjpeg-dev libpng-dev libpq-dev libjpeg62-turbo-dev \
libxml2-dev libjpeg-dev libpng-dev libpq-dev libjpeg62-turbo-dev \
libxml2-dev libxslt1-dev libfreetype6-dev libmagickwand-dev"; \
install_packages="acl cron gifsicle git ssmtp imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libpq5 libxml2 libxslt1.1 mariadb-client nano patch pkg-config procps openssl openssh-client \
optipng rsync sudo unzip vim webp"; \
libbz2-dev libpq5 libxml2 libxslt1.1 mariadb-client nano patch pkg-config procps openssl \
openssh-client optipng rsync sudo unzip vim webp"; \
apt-get update; \
apt-get install -y --no-install-recommends ${build_dependencies}; \
apt-get install -y ${install_packages}; \
......
......@@ -16,8 +16,8 @@ RUN set -ex; \
libjpeg-dev libpng-dev libpq-dev libjpeg62-turbo-dev libxml2-dev \
libxslt1-dev libfreetype6-dev libmagickwand-dev"; \
install_packages="acl cron gifsicle git ssmtp imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libpq5 libxml2 libxslt1.1 libzip-dev mariadb-client nano patch pkg-config procps openssl openssh-client \
optipng rsync sudo unzip vim webp zip"; \
libbz2-dev libpq5 libxml2 libxslt1.1 libzip-dev mariadb-client nano patch pkg-config procps \
openssl openssh-client optipng rsync sudo unzip vim webp zip"; \
apt-get update; \
apt-get install -y --no-install-recommends ${build_dependencies}; \
apt-get install -y ${install_packages}; \
......@@ -29,6 +29,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-freetype-dir=/usr/; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
bz2 \
calendar \
curl \
pcntl \
......
......@@ -7,17 +7,21 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
# pool configuration
COPY shared/zz-www.conf /usr/local/etc/php-fpm.d/
# Add backports to sources.list
RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
# Install packages with clean up
RUN set -ex; \
build_dependencies="autoconf dpkg-dev file g++ gcc make pkgconf re2c libcurl4-nss-dev \
libjpeg-dev libpng-dev libpq-dev libjpeg62-turbo-dev libxml2-dev \
libxslt1-dev libfreetype6-dev libmagickwand-dev"; \
install_packages="acl cron gifsicle git imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs libpq5 \
libonig-dev libsodium-dev libxml2 libxslt1.1 libzip-dev mariadb-client nano patch pkg-config \
procps openssl openssh-client optipng rsync sudo unzip vim webp zip"; \
libbz2-dev libonig-dev libsodium-dev libxml2 libxslt1.1 libzip-dev mariadb-client nano patch \
pkg-config procps openssl openssh-client optipng rsync sudo unzip vim webp zip"; \
apt-get update; \
apt-get install -y --no-install-recommends ${build_dependencies}; \
apt-get install -y ${install_packages}; \
apt-get -t buster-backports install -y ssmtp; \
pecl install xdebug redis imagick mongodb; \
docker-php-ext-enable imagick; \
docker-php-ext-enable redis; \
......@@ -25,6 +29,7 @@ RUN set -ex; \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr --with-freetype-dir=/usr/; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
bz2 \
calendar \
curl \
pcntl \
......@@ -55,9 +60,8 @@ RUN composer global require hirak/prestissimo
RUN curl -LO https://deployer.org/deployer.phar && mv deployer.phar /usr/local/bin/dep && chmod +x /usr/local/bin/dep
# Configure ssmtp to use mail:1025 as a smtp server and php to use ssmtp as sendmail_path
# Actually there is no installation candidate for buster...
#RUN echo "mailhub=mail:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/ssmtp/ssmtp.conf && \
# echo "sendmail_path = /usr/sbin/ssmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini
RUN echo "mailhub=mail:1025\nUseTLS=NO\nFromLineOverride=YES" > /etc/ssmtp/ssmtp.conf && \
echo "sendmail_path = /usr/sbin/ssmtp -t" > /usr/local/etc/php/conf.d/sendmail.ini
# Enable our own entrypoint which can be used to install/enable xdebug using env variables
COPY shared/team23-docker-php-enable-xdebug.sh shared/team23-docker-php-entrypoint.sh /usr/local/bin/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment