From 12b13d61997c78ce7188a29d6be7517d0cf62ad8 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 16 Feb 2018 15:45:47 +0000 Subject: [PATCH] mount app as volume in docker container for local tests change to overrides --- base.yml => docker-compose-overrides.yml | 14 +++++++++++++- docker-compose.yml | 7 +++++-- 2 files changed, 18 insertions(+), 3 deletions(-) rename base.yml => docker-compose-overrides.yml (50%) diff --git a/base.yml b/docker-compose-overrides.yml similarity index 50% rename from base.yml rename to docker-compose-overrides.yml index ef5f44a..3d64975 100644 --- a/base.yml +++ b/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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8c612e5..6126666 100644 --- a/docker-compose.yml +++ b/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