Skip to content

Commit 199f4a5

Browse files
committed
add missing package for sending any DEV emails, move apt-get install package
1 parent 585ff74 commit 199f4a5

File tree

1 file changed

+42
-44
lines changed

1 file changed

+42
-44
lines changed

Dockerfile

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,32 @@ ENV LANG=${OS_LOCALE} \
99
DEBIAN_FRONTEND=noninteractive
1010

1111
# Install packages then remove cache package list information
12-
RUN \
13-
BUILD_DEPS='software-properties-common' \
12+
RUN BUILD_DEPS='software-properties-common' \
1413
&& dpkg-reconfigure locales \
15-
&& apt-get install --no-install-recommends -y $BUILD_DEPS \
16-
&& add-apt-repository -y ppa:ondrej/php \
17-
&& add-apt-repository -y ppa:ondrej/apache2 \
18-
&& apt-get update \
19-
&& apt-get install -y curl apache2 libapache2-mod-php7.3 php7.3-cli php7.3-readline php7.3-mbstring php7.3-zip php7.3-intl php7.3-xml php7.3-json php7.3-curl php7.3-gd php7.3-pgsql php7.3-mysql php-pear \
20-
&& apt-get update && apt-get install -yq --no-install-recommends \
21-
git \
22-
cron \
23-
ghostscript \
24-
mailutils \
25-
iputils-ping \
26-
mysql-client \
27-
libgs-dev \
28-
imagemagick \
29-
libmagickwand-dev \
30-
language-pack-en \
31-
supervisor \
32-
rsyslog \
33-
vim \
34-
wget \
35-
postfix \
36-
# Cleaning
37-
&& apt-get purge -y --auto-remove $BUILD_DEPS \
38-
&& apt-get autoremove -y \
39-
&& rm -rf /var/lib/apt/lists/*
14+
&& apt-get install -y $BUILD_DEPS \
15+
&& add-apt-repository -y ppa:ondrej/php \
16+
&& add-apt-repository -y ppa:ondrej/apache2 \
17+
&& apt-get update \
18+
&& apt-get install -y curl apache2 libsasl2-modules libapache2-mod-php7.3 php7.3-cli php7.3-readline php7.3-mbstring php7.3-zip php7.3-intl php7.3-xml php7.3-json php7.3-curl php7.3-gd php7.3-pgsql php7.3-mysql php-pear \
19+
&& apt-get update && apt-get install -yq --no-install-recommends \
20+
git \
21+
cron \
22+
ghostscript \
23+
mailutils \
24+
iputils-ping \
25+
mysql-client \
26+
libgs-dev \
27+
imagemagick \
28+
libmagickwand-dev \
29+
language-pack-en \
30+
supervisor \
31+
rsyslog \
32+
vim \
33+
wget \
34+
postfix \
35+
&& apt-get purge -y --auto-remove $BUILD_DEPS \
36+
&& apt-get autoremove -y \
37+
&& rm -rf /var/lib/apt/lists/*
4038

4139
# POSTFIX
4240
RUN update-locale LANG=en_US.UTF-8
@@ -51,9 +49,9 @@ COPY ./tests /opt/tests
5149
RUN tar xf /opt/tests/2.1.6.tar.gz -C /opt/tests/
5250

5351
# SUPERVISOR
54-
RUN chmod -R 755 /opt/* && \
55-
mkdir -p /var/log/supervisor && \
56-
cp /opt/app/supervisord /etc/supervisor/conf.d/supervisord.conf
52+
RUN chmod -R 755 /opt/* \
53+
&& mkdir -p /var/log/supervisor \
54+
&& cp /opt/app/supervisord /etc/supervisor/conf.d/supervisord.conf
5755

5856
# COMPOSER
5957
RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
@@ -72,20 +70,20 @@ RUN a2enmod userdir rewrite ssl
7270

7371
# Environment variables contained within build container.
7472
ENV TERM=xterm \
75-
LISTEN_PORT=80 \
76-
APACHE_RUN_USER=www-data \
77-
APACHE_RUN_GROUP=www-data \
78-
APACHE_LOG_DIR=/var/log/apache2 \
79-
APACHE_LOCK_DIR=/var/lock/apache2 \
80-
APACHE_PID_FILE=/var/run/apache2.pid \
81-
AUTHORIZED_KEYS=$AUTHORIZED_KEYS \
82-
DOCKERCLOUD_SERVICE_FQDN=$DOCKERCLOUD_SERVICE_FQDN \
83-
LOG_TOKEN=$LOG_TOKEN \
84-
NODE_ENVIRONMENT=$NODE_ENVIRONMENT \
85-
PATH="~/.composer/vendor/bin:$PATH" \
86-
SMTP_HOST=$SMTP_HOST \
87-
SASL_USER=$SASL_USER \
88-
SASL_PASS=$SASL_PASS
73+
LISTEN_PORT=80 \
74+
APACHE_RUN_USER=www-data \
75+
APACHE_RUN_GROUP=www-data \
76+
APACHE_LOG_DIR=/var/log/apache2 \
77+
APACHE_LOCK_DIR=/var/lock/apache2 \
78+
APACHE_PID_FILE=/var/run/apache2.pid \
79+
AUTHORIZED_KEYS=$AUTHORIZED_KEYS \
80+
DOCKERCLOUD_SERVICE_FQDN=$DOCKERCLOUD_SERVICE_FQDN \
81+
LOG_TOKEN=$LOG_TOKEN \
82+
NODE_ENVIRONMENT=$NODE_ENVIRONMENT \
83+
PATH="~/.composer/vendor/bin:$PATH" \
84+
SMTP_HOST=$SMTP_HOST \
85+
SASL_USER=$SASL_USER \
86+
SASL_PASS=$SASL_PASS
8987

9088
# Build-time metadata as defined at http://label-schema.org
9189
ARG BUILD_DATE

0 commit comments

Comments
 (0)