diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index ee62716..fbc8dee 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -74,8 +74,7 @@ RUN echo PassengerMaxPoolSize 3 >> /etc/apache2/apache2.conf RUN echo PassengerMinInstances 3 >> /etc/apache2/apache2.conf RUN echo PassengerPreStart *:443 >> /etc/apache2/apache2.conf -# Set timezone to new york -RUN timedatectl set-timezone America/New_York + # By default, simply start apache. CMD /usr/sbin/apache2ctl -D FOREGROUND diff --git a/rails-prod.sh b/rails-prod.sh index 0ee4b62..9c415a6 100755 --- a/rails-prod.sh +++ b/rails-prod.sh @@ -9,4 +9,4 @@ docker kill $1 docker rm $1 docker build -t $1 -f rails-prod-Dockerfile . -docker run --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /srv/docker/apache2/logs:/var/log/apache2 -p 80:80 -p 443:443 $1 +docker run --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /srv/docker/apache2/logs:/var/log/apache2 -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1 diff --git a/rails-worker-prod.sh b/rails-worker-prod.sh index 3c77bdf..8014fbc 100755 --- a/rails-worker-prod.sh +++ b/rails-worker-prod.sh @@ -9,4 +9,4 @@ docker kill $1 docker rm $1 docker build -t $1 -f rails-prod-Dockerfile . -docker run --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE $1 bundle exec rake jobs:work RAILS_ENV=production \ No newline at end of file +docker run --name $1 -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /etc/localtime:/etc/localtime $1 bundle exec rake jobs:work RAILS_ENV=production \ No newline at end of file