diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 270394bba..83de99bb9 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -67,11 +67,11 @@ To run in a detached (background) mode, just:: These commands don't run the docs service. In order to run docs service you can run:: - $ docker compose -f docs.yml up + $ docker compose -f docker-compose.docs.yml up To run the docs with local services just use:: - $ docker compose -f docker-compose.local.yml -f docs.yml up + $ docker compose -f docker-compose.local.yml -f docker-compose.docs.yml up The site should start and be accessible at http://localhost:3000 if you selected Webpack or Gulp as frontend pipeline and http://localhost:8000 otherwise. diff --git a/docs/document.rst b/docs/document.rst index f93f2b60e..61cb692d3 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -11,7 +11,7 @@ After you have set up to `develop locally`_, run the following command from the If you set up your project to `develop locally with docker`_, run the following command: :: - $ docker compose -f docs.yml up + $ docker compose -f docker-compose.docs.yml up Navigate to port 9000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. diff --git a/tests/test_docker.sh b/tests/test_docker.sh index e25b6307d..473eede04 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -43,7 +43,7 @@ docker compose -f docker-compose.local.yml run \ django python manage.py check --settings=config.settings.production --deploy --database default --fail-level WARNING # Generate the HTML for the documentation -docker compose -f docs.yml run docs make html +docker compose -f docker-compose.docs.yml run docs make html # Run npm build script if package.json is present if [ -f "package.json" ] diff --git a/{{cookiecutter.project_slug}}/.drone.yml b/{{cookiecutter.project_slug}}/.drone.yml index 29bf52bf6..d6c13e62b 100644 --- a/{{cookiecutter.project_slug}}/.drone.yml +++ b/{{cookiecutter.project_slug}}/.drone.yml @@ -32,7 +32,7 @@ steps: DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB commands: - docker-compose -f docker-compose.local.yml build - - docker-compose -f docs.yml build + - docker-compose -f docker-compose.docs.yml build - docker-compose -f docker-compose.local.yml run --rm django python manage.py migrate - docker-compose -f docker-compose.local.yml up -d - docker-compose -f docker-compose.local.yml run django pytest diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 8e213de9a..5cb9ead4f 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: run: docker compose -f docker-compose.local.yml build django - name: Build the docs - run: docker compose -f docs.yml build docs + run: docker compose -f docker-compose.docs.yml build docs - name: Run DB Migrations run: docker compose -f docker-compose.local.yml run --rm django python manage.py migrate diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index fa1ebb67e..41eea0db4 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -34,7 +34,7 @@ pytest: - docker:dind before_script: - docker compose -f docker-compose.local.yml build - - docker compose -f docs.yml build + - docker compose -f docker-compose.docs.yml build # Ensure celerybeat does not crash due to non-existent tables - docker compose -f docker-compose.local.yml run --rm django python manage.py migrate - docker compose -f docker-compose.local.yml up -d diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml index a882b3e9e..97f9f60a2 100644 --- a/{{cookiecutter.project_slug}}/.travis.yml +++ b/{{cookiecutter.project_slug}}/.travis.yml @@ -20,7 +20,7 @@ jobs: - docker compose -v - docker -v - docker compose -f docker-compose.local.yml build - - docker compose -f docs.yml build + - docker compose -f docker-compose.docs.yml build # Ensure celerybeat does not crash due to non-existent tables - docker compose -f docker-compose.local.yml run --rm django python manage.py migrate - docker compose -f docker-compose.local.yml up -d diff --git a/{{cookiecutter.project_slug}}/docs.yml b/{{cookiecutter.project_slug}}/docker-compose.docs.yml similarity index 100% rename from {{cookiecutter.project_slug}}/docs.yml rename to {{cookiecutter.project_slug}}/docker-compose.docs.yml