@@ -20,7 +20,7 @@ Using Docker
20
20
------------
21
21
22
22
* Install Docker
23
- * ``pip install docker- compose ``
23
+ * ``pip install docker compose ``
24
24
* Create a ``secrets.json `` file at the root of the repository (next to `Dockerfile `), containing
25
25
something like::
26
26
@@ -30,22 +30,22 @@ Using Docker
30
30
"db_password": "secret"
31
31
}
32
32
33
- * ``docker- compose up --build ``
33
+ * ``docker compose up --build ``
34
34
* Follow instructions above to create/load the DB, grant permissions, create the
35
35
config, etc. For example::
36
36
37
- docker- compose up --build
37
+ docker compose up --build
38
38
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
41
41
42
42
Using Podman
43
43
------------
44
44
45
45
It may be possible to use Podman for local development to more closely simulate
46
46
production. The above Docker instructions should work for Podman as well,
47
47
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
49
49
container before it will rebuild properly).
50
50
51
51
How to port the CSS from djangoproject.com
@@ -69,16 +69,16 @@ How to recreate `trac.sql` after upgrading Trac
69
69
70
70
Start with a clean slate::
71
71
72
- docker- compose down
72
+ docker compose down
73
73
sh -c 'cd ../djangoproject.com && git checkout tracdb/trac.sql'
74
74
75
- Bring up database and Trac via docker- compose::
75
+ Bring up database and Trac via docker compose::
76
76
77
- docker- compose up --build -d
77
+ docker compose up --build -d
78
78
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
82
82
83
83
84
84
Note:
0 commit comments