Merge branch 'dev' of github.com:EBISPOT/OXO into loinc

EBISPOT · Apr 29, 2020 · 3a9a880 · 3a9a880
2 parents 216fba9 + b79e5e9
commit 3a9a880
Show file tree

Hide file tree

Showing 55 changed files with 2,287 additions and 2,934 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,6 +3,7 @@ oxo-*
 .idea
 dataloading
 neo4jimport/*.csv
+neo4jdata
 db
 solr-config/data
 *.rtf

diff --git a/dataloading/oxo/.dockerignore b/dataloading/oxo/.dockerignore
@@ -0,0 +1 @@
+#config_localdev.ini
diff --git a/dataloading/oxo/Dockerfile b/dataloading/oxo/Dockerfile
@@ -0,0 +1,12 @@
+FROM jfloff/alpine-python:2.7
+MAINTAINER Simon Jupp "[email protected]"
+
+RUN mkdir /app
+WORKDIR /app
+COPY *.py requirements.txt ./
+
+RUN apk add --no-cache mariadb-dev build-base
+#RUN apk --update add mysql mysql-client
+RUN pip install -r requirements.txt
+
+CMD bash