Skip to content

Commit

Permalink
Fix postfix provisioning
Browse files Browse the repository at this point in the history
  • Loading branch information
@mblaschke
mblaschke committed Jul 11, 2017
1 parent 6a1af90 commit 1b942bb
Show file tree
Hide file tree
Showing 40 changed files with 119 additions and 46 deletions.
2 changes: 1 addition & 1 deletion docker/base/alpine/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/alpine/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/centos-7/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/centos-7/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/debian-7/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/debian-8/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/debian-9/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-15.04/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-15.04/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-15.10/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-15.10/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-16.04/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-16.04/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-16.10/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-16.10/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/base/ubuntu-17.04/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/base/ubuntu-17.04/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 0 additions & 2 deletions docker/php-apache-dev/centos-7-php7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
php70w-pecl-xdebug \
blackfire-php \
blackfire-agent \
# Fix mysql lib
&& ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 \
# Enable php development services
&& docker-service-enable syslog ssh postfix \
&& /opt/docker/bin/bootstrap.sh \
Expand Down
2 changes: 0 additions & 2 deletions docker/php-dev/centos-7-php7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
php70w-pecl-xdebug \
blackfire-php \
blackfire-agent \
# Fix mysql lib
&& ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 \
# Enable php development services
&& docker-service-enable syslog ssh postfix \
&& /opt/docker/bin/bootstrap.sh \
Expand Down
2 changes: 0 additions & 2 deletions docker/php-nginx-dev/centos-7-php7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
php70w-pecl-xdebug \
blackfire-php \
blackfire-agent \
# Fix mysql lib
&& ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18 \
# Enable php development services
&& docker-service-enable syslog ssh postfix \
&& /opt/docker/bin/bootstrap.sh \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/5.6/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
7 changes: 6 additions & 1 deletion docker/php-official/5.6/conf/provision/service.d/postfix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ case "$IMAGE_FAMILY" in

RedHat)
yum-install postfix
HOSTNAME
;;

Alpine)
apk-install postfix
ln -s -f /etc/postfix/aliases /etc/aliases

# Fix mysql lib
if [[ ! -f /lib64/libmysqlclient.so.18 ]] && [[ -f /usr/lib64/mysql/libmysqlclient.so.18 ]]; then
echo ln -s /usr/lib64/mysql/libmysqlclient.so.18 /lib64/libmysqlclient.so.18
fi
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/php-official/7.0/conf/bin/service.d/postfix.d/10-init.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cp -f /etc/services /var/spool/postfix/etc/services

# General
go-replace --mode=lineinfile \
-s '/myhostname[ ]* =/c\' -r "myhostname = $(hostname)" \
-s '/myhostname[ ]* =/c\' -r "myhostname = $HOSTNAME" \
-s '/inet_interfaces[ ]* =/c\' -r "inet_interfaces = 127.0.0.1" \
-- /etc/postfix/main.cf

Expand Down
Loading

0 comments on commit 1b942bb

Please sign in to comment.