Commit 2932b7ec authored by Manuel Christlieb's avatar Manuel Christlieb

Merge branch 'dev/fix-image' into 'master'

5.6 and 7.4 fixes

See merge request !4
parents 38184411 36248974
Pipeline #31100 passed with stage
in 8 minutes and 59 seconds
......@@ -12,8 +12,8 @@ RUN set -ex; \
build_dependencies="autoconf dpkg-dev file g++ gcc make pkgconf re2c libcurl4-nss-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 \
libbz2-dev libpq5 libxml2 libxslt1.1 mariadb-client nano patch pkg-config procps openssl \
install_packages="acl cron gifsicle git imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libbz2-dev libpq5 libxml2 libxslt1.1 mariadb-client msmtp 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}; \
......@@ -39,7 +39,6 @@ RUN set -ex; \
intl \
xsl \
zip \
sodium \
; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${build_dependencies}; \
rm -rf /var/lib/apt/lists/*; \
......@@ -54,9 +53,13 @@ RUN composer global require hirak/prestissimo
# Install deployer
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
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
# Configure msmtp to use mail:1025 as a smtp server and php to use msmtp as sendmail_path
RUN echo "account default \n \
host mail \n \
from \"test@mail.de\" \n \
port 1025" >> /etc/msmtprc
RUN chmod 600 /etc/msmtprc
RUN echo "sendmail_path = /usr/bin/msmtp -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/
......
......@@ -15,8 +15,8 @@ RUN set -ex; \
build_dependencies="autoconf dpkg-dev file g++ gcc make pkgconf re2c libcurl4-nss-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 \
libbz2-dev libpq5 libxml2 libxslt1.1 mariadb-client nano patch pkg-config procps openssl \
install_packages="acl cron gifsicle git imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libbz2-dev libpq5 libxml2 libxslt1.1 mariadb-client msmtp 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}; \
......@@ -59,9 +59,13 @@ RUN composer global require hirak/prestissimo
# Install deployer
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
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
# Configure msmtp to use mail:1025 as a smtp server and php to use msmtp as sendmail_path
RUN echo "account default \n \
host mail \n \
from \"test@mail.de\" \n \
port 1025" >> /etc/msmtprc
RUN chmod 600 /etc/msmtprc
RUN echo "sendmail_path = /usr/bin/msmtp -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/
......
......@@ -15,8 +15,8 @@ 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 ssmtp imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libbz2-dev libpq5 libxml2 libxslt1.1 libzip-dev mariadb-client nano patch pkg-config procps \
install_packages="acl cron gifsicle git imagemagick graphicsmagick gsfonts jpegoptim libjpeg-turbo-progs \
libbz2-dev libpq5 libxml2 libxslt1.1 libzip-dev mariadb-client msmtp 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}; \
......@@ -59,9 +59,13 @@ RUN composer global require hirak/prestissimo
# Install deployer
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
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
# Configure msmtp to use mail:1025 as a smtp server and php to use msmtp as sendmail_path
RUN echo "account default \n \
host mail \n \
from \"test@mail.de\" \n \
port 1025" >> /etc/msmtprc
RUN chmod 600 /etc/msmtprc
RUN echo "sendmail_path = /usr/bin/msmtp -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/
......
......@@ -23,7 +23,7 @@ RUN set -ex; \
docker-php-ext-enable imagick; \
docker-php-ext-enable redis; \
docker-php-ext-enable mongodb; \
docker-php-ext-configure gd --with-png=/usr --with-jpeg=/usr --with-freetype=/usr/; \
docker-php-ext-configure gd --with-jpeg=/usr --with-freetype=/usr/; \
docker-php-ext-install -j "$(nproc)" \
bcmath \
bz2 \
......
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