diff --git a/.dockerignore b/.dockerignore index 9b21589..ddce87a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ **/__pycache__ *.pyc .* -docker-compose.yml +compose.override.yml Dockerfile justfile LICENSE diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 1690bcd..38fd8a0 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -41,10 +41,10 @@ jobs: - name: Docker - Build image from starter project run: | cd test_project - docker-compose pull - docker-compose build + docker compose pull + docker compose build - name: Docker - Test generated starter project run: | cd test_project - docker-compose run --rm web pytest + docker compose run --rm web pytest diff --git a/README.md b/README.md index 8f8202d..13a1094 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ ## :triangular_flag_on_post: Features -- Django 4.2.x +- Django 5.0 +- Python 3.12 - django-click - Docker - Docker Compose @@ -44,28 +45,28 @@ $ django-admin startproject \ ```shell # Build our Docker Image -$ docker-compose build +$ docker compose build # Run Migrations -$ docker-compose run --rm web python manage.py migrate +$ docker compose run --rm web python manage.py migrate # Create a Superuser in Django -$ docker-compose run --rm web python manage.py createsuperuser +$ docker compose run --rm web python manage.py createsuperuser # Run Django on http://localhost:8000/ -$ docker-compose up +$ docker compose up # Run Django in background mode -$ docker-compose up -d +$ docker compose up -d # Stop all running containers -$ docker-compose down +$ docker compose down # Run Tests -$ docker-compose run --rm web pytest +$ docker compose run --rm web pytest # Re-build PIP requirements -$ docker-compose run --rm web pip-compile requirements/requirements.in +$ docker compose run --rm web pip-compile requirements/requirements.in ``` ## Author diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml diff --git a/justfile b/justfile index 827a73c..48b4642 100644 --- a/justfile +++ b/justfile @@ -18,9 +18,9 @@ bootstrap *ARGS: cp .env.example .env fi - if [ ! -f "docker compose.override.yml" ]; then - echo "docker compose.override.yml created" - cp docker compose.override.yml-dist compose.override.yml + if [ ! -f "compose.override.yml" ]; then + echo "compose.override.yml created" + cp compose.override.yml-dist compose.override.yml fi docker compose {{ ARGS }} build --force-rm