Просмотр исходного кода

mount app as volume in docker container for local tests
change to overrides

Henry Oswald 8 лет назад
Родитель
Сommit
c0058ac720
2 измененных файлов с 18 добавлено и 3 удалено
  1. 13 1
      services/clsi/docker-compose-overrides.yml
  2. 5 2
      services/clsi/docker-compose.yml

+ 13 - 1
services/clsi/base.yml → services/clsi/docker-compose-overrides.yml

@@ -1,7 +1,7 @@
 version: "2"
 
 services:
-  base:
+  dev:
     environment:
       TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
       TEXLIVE_IMAGE_USER: root
@@ -12,3 +12,15 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./docker-runner:/app/node_modules/docker-runner-sharelatex
       - ./compiles:/app/compiles
+      
+  ci:
+    environment:
+      TEXLIVE_IMAGE: quay.io/sharelatex/texlive-full:2017.1
+      TEXLIVE_IMAGE_USER: root
+      SHARELATEX_CONFIG: /app/config/settings.defaults.coffee
+      COMMAND_RUNNER: docker-runner-sharelatex
+      COMPILES_HOST_DIR: $PWD/compiles
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./docker-runner:/app/node_modules/docker-runner-sharelatex
+      - ./compiles:/app/compiles

+ 5 - 2
services/clsi/docker-compose.yml

@@ -15,9 +15,12 @@ services:
 
   test_acceptance:
     build: .
+    volumes:
+      - .:/app
+    working_dir: /app
     extends:
-      file: base.yml
-      service: base
+      file: docker-compose-overrides.yml
+      service: dev
     environment:
       REDIS_HOST: redis
       MONGO_HOST: mongo