Skip to content

Commit 14341a9

Browse files
authored
Fixed #235 -- Updated outdated docker compose commands in README
1 parent 45b7589 commit 14341a9

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

README.rst

+11-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Using Docker
2020
------------
2121

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

@@ -30,22 +29,22 @@ Using Docker
3029
"db_password": "secret"
3130
}
3231

33-
* ``docker-compose up --build``
32+
* ``docker compose up --build``
3433
* Follow instructions above to create/load the DB, grant permissions, create the
3534
config, etc. For example::
3635

37-
docker-compose up --build
36+
docker compose up --build
3837
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
38+
docker compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
39+
docker compose exec trac trac-admin /code/trac-env/ permission add anonymous TRAC_ADMIN
4140

4241
Using Podman
4342
------------
4443

4544
It may be possible to use Podman for local development to more closely simulate
4645
production. The above Docker instructions should work for Podman as well,
4746
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
47+
``docker compose`` (e.g., it may require pruning or forcefully stopping a
4948
container before it will rebuild properly).
5049

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

7069
Start with a clean slate::
7170

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

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

77-
docker-compose up --build -d
76+
docker compose up --build -d
7877
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
78+
docker compose exec -T db psql $DATABASE_URL < ../djangoproject.com/tracdb/trac.sql
79+
docker compose exec trac /venv/bin/trac-admin /code/trac-env/ upgrade
80+
docker compose exec db pg_dump --column-inserts -d $DATABASE_URL > ../djangoproject.com/tracdb/trac.sql
8281

8382

8483
Note:

0 commit comments

Comments
 (0)