Skip to content

Commit c746297

Browse files
committed
Squashed commit of the following:
commit fa69f586b54d462b5effac77666678a39b39c261 Author: Viktor Roytman <vr2262@columbia.edu> Date: Tue Dec 6 14:59:12 2016 -0500 Update version to 0.0.7 commit 1dbabdebcc3806e7dea58f288d23182e028ef10d Author: Viktor Roytman <vr2262@columbia.edu> Date: Tue Dec 6 14:58:29 2016 -0500 Update cron command
1 parent a89ed5d commit c746297

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

prod/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
minigrid:
4-
image: selcolumbia/minigrid-server:0.0.6
4+
image: selcolumbia/minigrid-server:0.0.7
55
command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com
66
depends_on:
77
- redis

prod/install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env sh
2-
# Minigrid Server installer for version 0.0.6
2+
# Minigrid Server installer for version 0.0.7
33
set -e
44

55
# Do you have docker installed?
@@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20
108108
printf "========================================\n"
109109
printf " Downloading configuration files \n"
110110
printf "========================================\n"
111-
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.6/prod/docker-compose.yml > docker-compose.yml
112-
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.6/prod/nginx.conf > nginx.conf
111+
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.7/prod/docker-compose.yml > docker-compose.yml
112+
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.7/prod/nginx.conf > nginx.conf
113113

114114
sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml
115115
sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf
@@ -142,7 +142,7 @@ CRON_CMD="mkdir -p /tmp/letsencrypt && "\
142142
" -v /var/lib/letsencrypt:/var/lib/letsencrypt:Z"\
143143
" -v /tmp:/tmp:Z"\
144144
" -v /var/log/letsencrypt:/var/log/letsencrypt:Z"\
145-
" quay.io/letsencrypt/letsencrypt renew --quiet --webroot-path /tmp/letsencrypt --post-hook 'touch /tmp/renewed' ; "\
145+
" quay.io/letsencrypt/letsencrypt renew --quiet --webroot --webroot-path /tmp/letsencrypt --post-hook 'touch /tmp/renewed' ; "\
146146
"if [ -f /tmp/renewed ] ; then docker restart $NGINX_CONTAINER_NAME ; fi ; "\
147147
"rm -f /tmp/renewed"
148148
# https://certbot.eff.org/#ubuntuxenial-nginx recommends running this twice a day on random minute within the hour

0 commit comments

Comments
 (0)