update mysql

This commit is contained in:
ALinuxNinja 2017-05-05 22:42:38 -04:00
parent 87a4c04fe9
commit 8333118c40
3 changed files with 10 additions and 3 deletions

View File

@ -1,8 +1,8 @@
FROM ruby:2.4 FROM ruby:2.4
## Install nodejs ## Install nodejs and mysql-client
RUN apt-get -y update \ RUN apt-get -y update \
&& apt-get -y install nodejs \ && apt-get -y install nodejs mysql-client\
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
## Install required gems ## Install required gems

View File

@ -12,7 +12,8 @@ services:
- "mysql" - "mysql"
- "rabbitmq" - "rabbitmq"
volumes: volumes:
- ./data/postal:/opt/postal/config - ./data/postal/assets:/opt/postal/public/assets
- ./data/postal/config:/opt/postal/config
- ./data/docker:/docker - ./data/docker:/docker
environment: environment:
- MYSQL_ROOT_PASSWORD=changeme - MYSQL_ROOT_PASSWORD=changeme

View File

@ -32,5 +32,11 @@ sed -i -e '/rabbitmq:/!b' -e ':a' -e "s/vhost.*/vhost: \/$RABBITMQ_DEFAULT_VHOST
## Clean Up ## Clean Up
rm -rf /opt/postal/tmp/pids/* rm -rf /opt/postal/tmp/pids/*
## Wait for MySQL to start up
echo "== Waiting for MySQL to start up =="
while ! mysqladmin ping -h mysql --silent; do
sleep 0.5
done
## Start Postal ## Start Postal
/opt/postal/bin/postal "$@" /opt/postal/bin/postal "$@"