Merge pull request #86 from SEL-Columbia/0.3.0

0.3.0

.travis.yml

@@ -4,8 +4,8 @@ python:
   - "3.7"
 cache: pip
 addons:
-  postgresql: "9.5"
-  firefox: "49.0"
+  postgresql: "9.6"
+  firefox: latest
 dist: bionic
 sudo: false
 

Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.7
 COPY . /minigrid-server
 WORKDIR /minigrid-server
 RUN set -x \
-  && curl -sL https://deb.nodesource.com/setup_7.x | bash \
+  && curl -sL https://deb.nodesource.com/setup_10.x | bash \
   && apt-get install -y nodejs \
   && rm -rf /var/lib/apt/lists/* \
   && npm install \

dev/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   minigrid:
     build:
@@ -17,4 +17,4 @@ services:
     environment:
       POSTGRES_DB: minigrid
   redis:
-    image: redis:3.2
+    image: redis:5.0

prod/docker-compose.yml

@@ -1,20 +1,20 @@
-version: '2'
+version: '3'
 services:
   minigrid:
-    image: selcolumbia/minigrid-server:0.2.9
+    image: selcolumbia/minigrid-server:0.3.0
     command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com
     depends_on:
       - redis
       - db
   db:
-    image: postgres:9.6.1
+    image: postgres:9.6
     environment:
       POSTGRES_DB: minigrid
   redis:
-    image: redis:3.2.5
+    image: redis:5.0
     command: redis-server --notify-keyspace-events "Ex"
   nginx:
-    image: nginx:1.11.6
+    image: nginx:1.16.1
     ports:
       - "80:80"
       - "443:443"

prod/install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# Minigrid Server installer for version 0.2.9
+# Minigrid Server installer for version 0.3.0
 set -e
 
 # Do you have docker installed?
@@ -37,7 +37,7 @@ else
     printf " Installing docker-compose in this      \n"
     printf " directory                              \n"
     printf "========================================\n"
-    $CURL -L https://github.com/docker/compose/releases/download/1.9.0/run.sh > docker-compose \
+    $CURL -L https://github.com/docker/compose/releases/download/1.24.1/run.sh > docker-compose \
       && chmod +x docker-compose
     ./docker-compose -v
   fi
@@ -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.2.9/prod/docker-compose.yml > docker-compose.yml
-$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.2.9/prod/nginx.conf > nginx.conf
+$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
 
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml
 sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf