Skip to content

Commit

Permalink
🚜 docker-compose => compose
Browse files Browse the repository at this point in the history
  • Loading branch information
jefftriplett committed Mar 2, 2024
1 parent 9ccf2a1 commit ad7964c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
**/__pycache__
*.pyc
.*
docker-compose.yml
compose.override.yml
Dockerfile
justfile
LICENSE
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
## :triangular_flag_on_post: Features

- Django 4.2.x
- Django 5.0
- Python 3.12
- django-click
- Docker
- Docker Compose
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ad7964c

Please sign in to comment.