Skip to content

Commit

Permalink
changes legacy docker-compose to current docker compose command (#802)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Gerber <394442-gerbsen@users.noreply.gitlab.com>
  • Loading branch information
gerbsen and Daniel Gerber authored Mar 1, 2025
1 parent e9bbcd2 commit 286e638
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ Then, clone this repository, make it your working directory, and run the followi
bin/docker-dev-up
```

You can now reach the voctoweb frontend at `http://localhost.c3voc.de/`. The backend is at `http://localhost.c3voc.de/admin`, with the default username `admin@example.org` and the password `media123`. You can stop the running containers using *Ctrl-C*. To start them again, just run `docker-compose up`.
You can now reach the voctoweb frontend at `http://localhost.c3voc.de/`. The backend is at `http://localhost.c3voc.de/admin`, with the default username `admin@example.org` and the password `media123`. You can stop the running containers using *Ctrl-C*. To start them again, just run `docker compose up`.

The whole application directory is mounted into the containers, so all changes you make to the files are reflected inside the application automatically. To run commands inside the voctoweb container, run `docker-compose run voctoweb $COMMAND`. If you ever need to rebuild the containers (because of new dependencies, for example), run the `docker-compose build` command again.
The whole application directory is mounted into the containers, so all changes you make to the files are reflected inside the application automatically. To run commands inside the voctoweb container, run `docker compose run voctoweb $COMMAND`. If you ever need to rebuild the containers (because of new dependencies, for example), run the `docker compose build` command again.

Image and video files in `docker/content` are tried first, if missing live data from media.ccc.de is used.

Expand Down
10 changes: 5 additions & 5 deletions bin/docker-dev-up
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

docker-compose build
docker-compose up -d postgres
docker-compose run voctoweb rake db:setup
docker-compose run voctoweb bin/update-data
docker-compose up voctoweb
docker compose build
docker compose up -d postgres
docker compose run --remove-orphans voctoweb rake db:setup
docker compose run --remove-orphans voctoweb bin/update-data
docker compose up voctoweb

0 comments on commit 286e638

Please sign in to comment.