From 67d7753d26777d1714e5668d10bde4f82e240b4e Mon Sep 17 00:00:00 2001 From: Jack Bott Date: Tue, 5 Nov 2019 00:48:31 -0500 Subject: [PATCH 1/2] compose version --- dev/docker-compose.yml | 2 +- prod/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 0195915..9140b16 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '2' services: minigrid: build: diff --git a/prod/docker-compose.yml b/prod/docker-compose.yml index da8d060..926d4c2 100644 --- a/prod/docker-compose.yml +++ b/prod/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '2' services: minigrid: image: selcolumbia/minigrid-server:0.3.0 From 3737c3ad2f2e98271ace969104720f155c81dbe1 Mon Sep 17 00:00:00 2001 From: Jack Bott Date: Tue, 5 Nov 2019 00:53:46 -0500 Subject: [PATCH 2/2] 3.1 --- prod/docker-compose.yml | 2 +- prod/install.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/prod/docker-compose.yml b/prod/docker-compose.yml index 926d4c2..919cd5c 100644 --- a/prod/docker-compose.yml +++ b/prod/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: minigrid: - image: selcolumbia/minigrid-server:0.3.0 + image: selcolumbia/minigrid-server:0.3.1 command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com depends_on: - redis diff --git a/prod/install.sh b/prod/install.sh index 5e3c230..77b9afe 100755 --- a/prod/install.sh +++ b/prod/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh -# Minigrid Server installer for version 0.3.0 +# Minigrid Server installer for version 0.3.1 set -e # Do you have docker installed? @@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20 printf "========================================\n" printf " Generating configuration \n" printf "========================================\n" -$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.3.0/prod/docker-compose.yml > docker-compose.yml -$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.3.0/prod/nginx.conf > nginx.conf +$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.3.1/prod/docker-compose.yml > docker-compose.yml +$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.3.1/prod/nginx.conf > nginx.conf sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf