Merge pull request inspirehep#2124 from david-caro/adapt_docker_to_no…

…nroot docker: adapt to non-root user
kaplun · May 24, 2017 · 576e20a · 576e20a
2 parents 1427bc0 + eb17fef
commit 576e20a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-compose.deps.yml b/docker-compose.deps.yml
@@ -20,7 +20,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-version: '2'
+version: '2.1'
 
 services:
   pip:

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -20,7 +20,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-version: '2'
+version: '2.1'
 
 services:
   test-service_base:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-version: '2'
+version: '2.1'
 
 services:
   service_base:

diff --git a/services.yml b/services.yml
@@ -20,11 +20,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization
 # or submit itself to any jurisdiction.
 
-version: '2'
+version: '2.1'
 
 services:
   base:
     image: inspirehep/python-base
+    tty: true
+    environment:
+      - BASE_USER_UID=${BASE_USER_UID:-1000}
+      - BASE_USER_GIT=${BASE_USER_GIT:-1000}
   indexer:
     image: inspirehep/elasticsearch
     command: elasticsearch -Dcluster.name="inspire" -Ddiscovery.zen.ping.multicast.enabled=false