Merge pull request #31 from ginkgobioworks/update-packages

Update packages

Dockerfile

@@ -1,7 +1,7 @@
 # Development Dockerfile to make testing easier under a standardized environment.
 # XXX Do not use for production as-is
 
-FROM python:2.7
+FROM python:2.7-stretch
 LABEL maintainer Ginkgo Bioworks <devs@ginkgobioworks.com>
 
 ARG GIT_USER_NAME="Curious Default"
@@ -12,13 +12,12 @@ RUN git config --global user.name "$GIT_USER_NAME" \
 
 
 ARG DEBIAN_FRONTEND=noninteractive
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get update
 RUN apt-get install --assume-yes --verbose-versions \
   apt-utils \
-  mysql-client \
+  default-mysql-client \
   nodejs \
-  nodejs-legacy \
-  npm \
   ncbi-blast+ \
   primer3
 

requirements-core.txt

@@ -1,6 +1,6 @@
 # django
 pytz == 2017.2
-Django == 1.11.6
+Django == 1.11.25
 
 # Celery
 celery == 4.1.0 

setup.py

@@ -128,10 +128,10 @@ def run(self):
     # force install Django2+ in setup
     setup_requires=[
         'django_assets >= 0.12',
-        'Django ~= 1.11.6',
+        'Django ~= 1.11.25',
     ],
     install_requires=[
-        'django ~= 1.11.6',
+        'django ~= 1.11.25',
         'jsmin',
         'celery >= 4.0',
         'bcbio-gff',

src/server/settings.py

@@ -97,7 +97,7 @@
     'mysql': {
         'ENGINE': 'django.db.backends.mysql',
         'OPTIONS': {
-            'init_command': "SET storage_engine=INNODB; SET sql_mode='STRICT_TRANS_TABLES';"
+            'init_command': "SET default_storage_engine=INNODB; SET sql_mode='STRICT_TRANS_TABLES';"
         },
         'HOST': os.getenv('DB_HOST', ''),
         'PORT': '',