From fc85d91123a398240ac3b69023afd71e616464a2 Mon Sep 17 00:00:00 2001 From: Daniel Gerber <394442-gerbsen@users.noreply.gitlab.com> Date: Sat, 22 Feb 2025 16:55:10 +0100 Subject: [PATCH] changes legacy docker-compose to current docker compose command --- README.md | 4 ++-- bin/docker-dev-up | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d1d6dd5c..742308c1 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/bin/docker-dev-up b/bin/docker-dev-up index cf626f5f..654dcb16 100755 --- a/bin/docker-dev-up +++ b/bin/docker-dev-up @@ -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 \ No newline at end of file