Skip to content

Commit fe366a3

Browse files
committed
Changing the command name docker-compose to docker compose
1 parent 45b7589 commit fe366a3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

README.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Using Docker
2020
------------
2121

2222
* Install Docker
23-
* ``pip install docker-compose``
23+
* ``pip install docker compose``
2424
* Create a ``secrets.json`` file at the root of the repository (next to `Dockerfile`), containing
2525
something like::
2626

@@ -30,22 +30,22 @@ Using Docker
3030
"db_password": "secret"
3131
}
3232

33-
* ``docker-compose up --build``
33+
* ``docker compose up --build``
3434
* Follow instructions above to create/load the DB, grant permissions, create the
3535
config, etc. For example::
3636

37-
docker-compose up --build
37+
docker compose up --build
3838
export DATABASE_URL=postgres://code.djangoproject:secret@db/code.djangoproject
39-
docker-compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
40-
docker-compose exec trac trac-admin /code/trac-env/ permission add anonymous TRAC_ADMIN
39+
docker compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
40+
docker compose exec trac trac-admin /code/trac-env/ permission add anonymous TRAC_ADMIN
4141

4242
Using Podman
4343
------------
4444

4545
It may be possible to use Podman for local development to more closely simulate
4646
production. The above Docker instructions should work for Podman as well,
4747
however, be aware that ``podman-compose`` is not as well battle-tested as
48-
``docker-compose`` (e.g., it may require pruning or forcefully stopping a
48+
``docker compose`` (e.g., it may require pruning or forcefully stopping a
4949
container before it will rebuild properly).
5050

5151
How to port the CSS from djangoproject.com
@@ -69,16 +69,16 @@ How to recreate `trac.sql` after upgrading Trac
6969

7070
Start with a clean slate::
7171

72-
docker-compose down
72+
docker compose down
7373
sh -c 'cd ../djangoproject.com && git checkout tracdb/trac.sql'
7474

75-
Bring up database and Trac via docker-compose::
75+
Bring up database and Trac via docker compose::
7676

77-
docker-compose up --build -d
77+
docker compose up --build -d
7878
export DATABASE_URL=postgres://code.djangoproject:secret@db/code.djangoproject
79-
docker-compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
80-
docker-compose exec trac /venv/bin/trac-admin /code/trac-env/ upgrade
81-
docker-compose exec db pg_dump --column-inserts -d $DATABASE_URL > ../djangoproject.com/tracdb/trac.sql
79+
docker compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
80+
docker compose exec trac /venv/bin/trac-admin /code/trac-env/ upgrade
81+
docker compose exec db pg_dump --column-inserts -d $DATABASE_URL > ../djangoproject.com/tracdb/trac.sql
8282

8383

8484
Note:

0 commit comments

Comments
 (0)