CS
This commit is contained in:
Michael RICOIS
parent
71688f4384
commit
7623703dc9
@ -4,11 +4,12 @@ ENV VERSION 0.6.5
|
||||
ENV HTTP_PORT 1080
|
||||
ENV SMTP_PORT 1025
|
||||
|
||||
RUN apk add --update ruby ruby-dev ruby-bigdecimal sqlite sqlite-dev build-base libstdc++ ca-certificates && \
|
||||
gem install json --no-ri --no-rdoc && \
|
||||
gem install mailcatcher -v $VERSION --no-ri --no-rdoc && \
|
||||
apk del --purge ruby-dev build-base && \
|
||||
rm -rf /var/cache/apk/*
|
||||
RUN apk add --update ruby ruby-dev ruby-bigdecimal sqlite sqlite-dev build-base libstdc++ ca-certificates \
|
||||
&& gem install json --no-ri --no-rdoc \
|
||||
&& gem install mailcatcher -v $VERSION --no-ri --no-rdoc \
|
||||
&& apk del --purge ruby-dev build-base \
|
||||
&& rm -rf /var/cache/apk/*
|
||||
|
||||
EXPOSE $SMTP_PORT $HTTP_PORT
|
||||
CMD mailcatcher -f --ip=0.0.0.0 --smtp-port=$SMTP_PORT --http-port=$HTTP_PORT
|
||||
|
||||
CMD mailcatcher -f --ip=0.0.0.0 --smtp-port=$SMTP_PORT --http-port=$HTTP_PORT
|
||||
|
||||
@ -4,18 +4,17 @@ ENV TERM xterm
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
# Installation
|
||||
RUN apt-get -y install software-properties-common && \
|
||||
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
|
||||
add-apt-repository 'deb [arch=amd64,i386] http://mirror6.layerjet.com/mariadb/repo/10.0/ubuntu trusty main' && \
|
||||
apt-get update && apt-get -y upgrade && apt-get install -y mariadb-server-10.0 pwgen && \
|
||||
rm -rf /var/lib/mysql/* && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf && \
|
||||
sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf && \
|
||||
sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf && \
|
||||
ln -s /dev/stderr /var/log/errorlog.err && \
|
||||
echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
RUN apt-get -y install software-properties-common \
|
||||
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db \
|
||||
&& add-apt-repository 'deb [arch=amd64,i386] http://mirror6.layerjet.com/mariadb/repo/10.0/ubuntu trusty main' \
|
||||
&& apt-get update && apt-get -y upgrade && apt-get install -y mariadb-server-10.0 pwgen \
|
||||
&& rm -rf /var/lib/mysql/* \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf \
|
||||
&& ln -s /dev/stderr /var/log/errorlog.err \
|
||||
&& echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
|
||||
# Add MySQL configuration
|
||||
ADD *.cnf /etc/mysql/conf.d/
|
||||
|
||||
@ -4,17 +4,17 @@ ENV TERM xterm
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
# Installation
|
||||
RUN apt-get update && apt-get -y install software-properties-common && \
|
||||
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
|
||||
add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu trusty main' && \
|
||||
apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-10.1 pwgen && \
|
||||
rm -rf /var/lib/mysql/* && \
|
||||
sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf && \
|
||||
sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf && \
|
||||
sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
ln -s /dev/stderr /var/log/errorlog.err && \
|
||||
echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
RUN apt-get update && apt-get -y install software-properties-common \
|
||||
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db \
|
||||
&& add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu trusty main' \
|
||||
&& apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-10.1 pwgen \
|
||||
&& rm -rf /var/lib/mysql/* \
|
||||
&& sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& ln -s /dev/stderr /var/log/errorlog.err \
|
||||
&& echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
|
||||
# Add MySQL configuration
|
||||
ADD *.cnf /etc/mysql/conf.d/
|
||||
|
||||
@ -6,17 +6,17 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV TZ=Europe/Paris
|
||||
|
||||
# Installation
|
||||
RUN apt-get update && apt-get -y install software-properties-common pwgen && \
|
||||
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
|
||||
add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.2/ubuntu xenial main' && \
|
||||
apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-10.2 && \
|
||||
rm -rf /var/lib/mysql/* && \
|
||||
sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf && \
|
||||
sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf && \
|
||||
sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
ln -s /dev/stderr /var/log/errorlog.err && \
|
||||
echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
RUN apt-get update && apt-get -y install software-properties-common pwgen \
|
||||
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db \
|
||||
&& add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.2/ubuntu xenial main' \
|
||||
&& apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-10.2 \
|
||||
&& rm -rf /var/lib/mysql/* \
|
||||
&& sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& ln -s /dev/stderr /var/log/errorlog.err \
|
||||
&& echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
|
||||
# Add MySQL configuration
|
||||
ADD *.cnf /etc/mysql/conf.d/
|
||||
|
||||
@ -4,17 +4,17 @@ ENV TERM xterm
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
# Installation
|
||||
RUN apt-get update && apt-get -y install software-properties-common && \
|
||||
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db && \
|
||||
add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/5.5/ubuntu trusty main' && \
|
||||
apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-5.5 pwgen && \
|
||||
rm -rf /var/lib/mysql/* && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf && \
|
||||
sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf && \
|
||||
sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf && \
|
||||
ln -s /dev/stderr /var/log/errorlog.err && \
|
||||
echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
RUN apt-get update && apt-get -y install software-properties-common \
|
||||
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db \
|
||||
&& add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/5.5/ubuntu trusty main' \
|
||||
&& apt-get update && apt-get -y upgrade && apt-get -y install mariadb-server-5.5 pwgen \
|
||||
&& rm -rf /var/lib/mysql/* \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& sed -i -e 's/log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/#log_bin[ \t]*= \/var\/log\/mysql\/mariadb-bin/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -e 's/log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/#log_bin_index[ \t]*= \/var\/log\/mysql\/mariadb-bin.index/g' /etc/mysql/my.cnf \
|
||||
&& sed -i -r 's/syslog/log_error=\/var\/log\/errorlog.err/' /etc/mysql/conf.d/mysqld_safe_syslog.cnf \
|
||||
&& ln -s /dev/stderr /var/log/errorlog.err \
|
||||
&& echo "Europe/Paris" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
|
||||
|
||||
# Add MySQL configuration
|
||||
ADD *.cnf /etc/mysql/conf.d/
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
FROM ubuntu:16.04
|
||||
|
||||
ENV TERM xterm
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV TZ=Europe/Paris
|
||||
|
||||
# Installation
|
||||
RUN apt-get update && apt-get -y install software-properties-common nano && \
|
||||
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 && \
|
||||
add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu xenial main' && \
|
||||
apt-get update && apt-get -y upgrade && apt-get -y install mariadb-client-10.1 pwgen \
|
||||
php7.0-cli php7.0-mcrypt php7.0-curl php7.0-xmlrpc php7.0-xsl php7.0-mysqlnd php7.0-gd \
|
||||
php7.0-json php7.0-intl php-imagick php-apcu && \
|
||||
sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php/7.0/cli/php.ini && \
|
||||
sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php/7.0/cli/php.ini && \
|
||||
sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php/7.0/cli/php.ini && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Add cron file description
|
||||
|
||||
# Add VOLUMEs
|
||||
VOLUME ["/home/vhosts"]
|
||||
|
||||
CMD ["cron", "-f"]
|
||||
Loading…
Reference in New Issue
Block a user