summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorTAKAHASHI Shuuji2022-11-24 05:06:17 +0900
committerGitHub2022-11-23 13:06:17 -0700
commitcb26d78d366cf63d81581a3683828c9ed2aa76bf (patch)
treec9052df745b850954ea0bcd80dc5c37d7e83e7f4 /docker
parent807d546b122401b2c1b9c7a613aeef1b2e768edf (diff)
downloadtakahe-cb26d78d366cf63d81581a3683828c9ed2aa76bf.tar.gz
takahe-cb26d78d366cf63d81581a3683828c9ed2aa76bf.tar.bz2
takahe-cb26d78d366cf63d81581a3683828c9ed2aa76bf.zip
Use repository root as build context in docker-compose
This fixes the issue where `docker-compose` fails to build takahe:latest container. The cause of issue is the build context for docker compose is different from the one of `docker build`. Currently, `make image` uses the repository root as a build context while `make compose_up` will use `docker/` directory as a build context. That's why docker-compose couldn't find the required files during building.
Diffstat (limited to 'docker')
-rw-r--r--docker/docker-compose.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index fa1346f..cacbdab 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,7 +6,10 @@ version: "3.4"
x-takahe-common:
&takahe-common
- build: .
+ build:
+ context: ..
+ dockerfile: ./docker/Dockerfile
+
image: takahe:latest
environment:
DJANGO_SETTINGS_MODULE: takahe.settings.development