From 487897beee79cf464ec9189d37bf96a9da41ed65 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Tue, 15 Feb 2022 10:39:26 +0900 Subject: [PATCH] Move Dockerfile.dev to docker directory --- .dockerignore | 13 ++++--------- docker-compose.dev.yml | 4 ++-- {backend => docker}/Dockerfile.dev | 0 3 files changed, 6 insertions(+), 11 deletions(-) rename {backend => docker}/Dockerfile.dev (100%) diff --git a/.dockerignore b/.dockerignore index 53cfd6bb..3fba7fcb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,18 +10,13 @@ !Pipfile.lock !Pipfile -backend/**/bundle/ -backend/**/node_modules/ -backend/**/webpack-stats.json - -backend/**/*.sqlite3 -backend/**/.env -backend/**/junitxml/ +backend/*.sqlite3* +backend/junitxml backend/media backend/filepond-temp-uploads backend/stored_uploads -backend/**/staticfiles/ -backend/**/venv/ +backend/staticfiles +backend/venv backend/**/__pycache__/ tests/**/__pycache__/ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 0896daa4..5fd71387 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -4,7 +4,7 @@ services: backend: build: context: . - dockerfile: backend/Dockerfile.dev + dockerfile: docker/Dockerfile.dev image: doccano_backend:dev volumes: - .:/src @@ -29,7 +29,7 @@ services: celery: build: context: . - dockerfile: backend/Dockerfile.dev + dockerfile: docker/Dockerfile.dev image: doccano_celery:dev volumes: - .:/src diff --git a/backend/Dockerfile.dev b/docker/Dockerfile.dev similarity index 100% rename from backend/Dockerfile.dev rename to docker/Dockerfile.dev