Update baseimage

Dockerfile

@@ -1,13 +1,12 @@
-FROM phusion/passenger-customizable:1.0.0
+FROM phusion/passenger-customizable:2.3.1
 
 ENV RAILS_ENV production
 
-RUN add-apt-repository ppa:certbot/certbot
 RUN apt-get -q update
 RUN apt-get -qy -o Dpkg::Options::="--force-confold" upgrade
 RUN echo 'postfix postfix/mailname string opensnp.org' | debconf-set-selections
 RUN echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections
-RUN apt-get install -qy libhiredis-dev postgresql-client-9.5 postfix imagemagick tzdata libpq-dev certbot python-certbot-nginx
+RUN apt-get install -qy libhiredis-dev postgresql-client postfix imagemagick tzdata libpq-dev certbot shared-mime-info
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN postconf -e myhostname=opensnp.org

bin/deploy

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
-docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-docker push opensnp/rails;
-docker push opensnp/rails-sidekiq;
+docker login
+docker push opensnp/rails
+docker push opensnp/rails-sidekiq

test/run

@@ -7,6 +7,8 @@ if [ -z "$snpr_rev" ]; then
   snpr_rev=$(git ls-remote https://github.com/opensnp/snpr master | cut -f 1)
 fi
 
+docker-compose kill
+docker-compose rm rails
 docker-compose build --build-arg SNPR_REV=$snpr_rev rails
 docker-compose up -d