From 78a7a755157247d1a5dcfee5c56b14fe0d7965fe Mon Sep 17 00:00:00 2001
From: Felix Lohmeier <felix.lohmeier@opencultureconsulting.de>
Date: Wed, 1 Feb 2017 23:59:13 +0100
Subject: [PATCH] get environment variables in docker network

---
 docker/README.md | 26 ++++++++++++++------------
 refine.py        | 11 +++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index ca9e458..068416f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,15 +5,18 @@ There are some client libraries for OpenRefine that communicate with the [OpenRe
 ### basic usage
 
 1) start server:
-```docker run -d --name=openrefine felixlohmeier/openrefine```
+```docker run -d --name=openrefine-server felixlohmeier/openrefine```
 
 2) start client (prints help screen):
-```docker run --rm --link openrefine felixlohmeier/openrefine-client -H openrefine```
+```docker run --rm --link openrefine-server felixlohmeier/openrefine-client```
+
+3) cleanup:
+```docker stop openrefine-server && docker rm openrefine-server```
 
 ### example for customized run commands in interactive mode (e.g. for usage in terminals)
 
 1) start server in terminal A:
-```docker run --rm --name=openrefine -p 80:3333 -v /home/felix/refine:/data:z felixlohmeier/openrefine -i 0.0.0.0 -m 4G -d /data```
+```docker run --rm --name=openrefine-server -p 80:3333 -v /home/felix/refine:/data:z felixlohmeier/openrefine -i 0.0.0.0 -m 4G -d /data```
 * automatically remove docker container when it exits
 * set name "openrefine" for docker container
 * publish internal port 3333 to host port 80
@@ -24,7 +27,7 @@ There are some client libraries for OpenRefine that communicate with the [OpenRe
 * OpenRefine should be available at http://localhost
 
 2) start client in terminal B (prints help screen):
-```docker run --rm --link openrefine -v /home/felix/refine:/data:z felixlohmeier/openrefine-client -H openrefine```
+```docker run --rm --link openrefine-server -v /home/felix/refine:/data:z felixlohmeier/openrefine-client```
 * automatically remove docker container when it exits
 * build up network connection with docker container "openrefine"
 * mount host directory /home/felix/refine as working directory
@@ -33,26 +36,25 @@ There are some client libraries for OpenRefine that communicate with the [OpenRe
 ### example for customized run commands in detached mode (e.g. for usage in shell scripts)
 
 1) define variables
-* ```workingdir=/home/felix/refine```
+*```workingdir=/home/felix/refine```
 * ```inputfile=example.csv```
 * ```jsonfile=test.json```
 
 
 2) start server
- ```docker run --d --name=openrefine -v ${workingdir}:/data:z felixlohmeier/openrefine -i 0.0.0.0 -m 4G -d /data```
+ ```docker run --d --name=openrefine-server -v ${workingdir}:/data:z felixlohmeier/openrefine -i 0.0.0.0 -m 4G -d /data```
 
 3) create project (import file)
-```docker run --rm --link openrefine -v ${workingdir}:/data:z felixlohmeier/openrefine-client -H openrefine -c $inputfile```
+```docker run --rm --link openrefine-server -v ${workingdir}:/data:z felixlohmeier/openrefine-client -c $inputfile```
 
 4) get project id
-```project=($(docker run --rm --link openrefine -v ${workingdir}:/data felixlohmeier/openrefine-client -H openrefine --list | cut -c 2-14))```
+```project=($(docker run --rm --link openrefine-server -v ${workingdir}:/data felixlohmeier/openrefine-client --list | cut -c 2-14))```
 
 5) apply transformations from json file
-```docker run --rm --link -v ${workingdir}:/data felixlohmeier/openrefine-client -H openrefine -f ${jsonfile} ${project}```
+```docker run --rm --link openrefine-server -v ${workingdir}:/data felixlohmeier/openrefine-client -f ${jsonfile} ${project}```
 
 6) export project to file
-```docker run --rm --link openrefine -v ${workingdir}:/data felixlohmeier/openrefine-client -E --output=${project}.tsv ${project}```
+```docker run --rm --link openrefine-server -v ${workingdir}:/data felixlohmeier/openrefine-client -E --output=${project}.tsv ${project}```
 
 7) cleanup
-* ```docker stop -t=500 openrefine```
-* ```docker rm openrefine```
+```docker stop -t=500 openrefine-server && docker rm openrefine-server```
diff --git a/refine.py b/refine.py
index 63a61c3..05ae62d 100755
--- a/refine.py
+++ b/refine.py
@@ -511,6 +511,17 @@ def export_project(project, options):
 #noinspection PyPep8Naming
 def main():
     """Main."""
+
+    # get environment variables in docker network
+    docker_host = os.environ.get('OPENREFINE_PORT_3333_TCP_ADDR')
+    if docker_host:
+        os.environ["OPENREFINE_HOST"] = docker_host
+        refine.REFINE_HOST = docker_host
+    docker_port = os.environ.get('OPENREFINE_PORT_3333_TCP_PORT')
+    if docker_port:
+        os.environ["OPENREFINE_HOST"] = docker_port
+        refine.REFINE_PORT = docker_port
+
     options, args = PARSER.parse_args()
 
     if options.host: