From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Tue, 24 Sep 2024 14:28:20 +0000 (+0200)
Subject: docker-compose to docker compose
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=62fdd5c5d1d10ab28112afdf57672cfe7571f87e;p=docker-django-scripts.git

docker-compose to docker compose
---

diff --git a/build/doc.sh b/build/doc.sh
index abc248d..61d607b 100755
--- a/build/doc.sh
+++ b/build/doc.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app bash /srv/doc/build.sh
+docker compose run app bash /srv/doc/build.sh
diff --git a/build/front.sh b/build/front.sh
index c4157f5..7cb0907 100755
--- a/build/front.sh
+++ b/build/front.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose exec -T app python /srv/app/manage.py build-front $1
+docker compose exec -T app python /srv/app/manage.py build-front $1
diff --git a/build/graph.sh b/build/graph.sh
index b5cda09..c0ad0db 100755
--- a/build/graph.sh
+++ b/build/graph.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py graph_models organization-core organization-media organization-pages organization.network organization.magazine organization.projects organization.agenda organization.shop organization.job > /srv/doc/graph/mezzanine-organization.dot
+docker compose run app python /srv/app/manage.py graph_models organization-core organization-media organization-pages organization.network organization.magazine organization.projects organization.agenda organization.shop organization.job > /srv/doc/graph/mezzanine-organization.dot
diff --git a/build/local/messages.sh b/build/local/messages.sh
index 5fe3892..fa7c2e8 100755
--- a/build/local/messages.sh
+++ b/build/local/messages.sh
@@ -1,4 +1,4 @@
-# docker-compose run app python manage.py compilemessages
+# docker compose run app python manage.py compilemessages
 
 cd /srv
 
diff --git a/build/messages.sh b/build/messages.sh
index cea64ee..63f0df9 100755
--- a/build/messages.sh
+++ b/build/messages.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app bash /srv/bin/build/local/messages.sh
+docker compose run app bash /srv/bin/build/local/messages.sh
diff --git a/dev/makemigrations.sh b/dev/makemigrations.sh
index d359a6f..9eeec8d 100755
--- a/dev/makemigrations.sh
+++ b/dev/makemigrations.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py makemigrations -v 3 $1 
+docker compose run app python /srv/app/manage.py makemigrations -v 3 $1
diff --git a/dev/migrate.sh b/dev/migrate.sh
index 98ad441..6de63c0 100755
--- a/dev/migrate.sh
+++ b/dev/migrate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py migrate -v 3
+docker compose run app python /srv/app/manage.py migrate -v 3
diff --git a/dev/poetry_add.sh b/dev/poetry_add.sh
index a496f45..0ff8201 100755
--- a/dev/poetry_add.sh
+++ b/dev/poetry_add.sh
@@ -3,5 +3,5 @@
 if [ -z "$1" ]; then
     echo -e "[WARNING] Please provide the name of package you want to install.\nThen execute the command : ./bin/dev/poetry_add.sh [name_of_package]"
 else
-    docker-compose exec app poetry add $1
+    docker compose exec app poetry add $1
 fi
diff --git a/dev/restore_db.sh b/dev/restore_db.sh
index 19a1536..de3badb 100755
--- a/dev/restore_db.sh
+++ b/dev/restore_db.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-docker-compose up -d db
-docker-compose run db bash -c "/srv/bin/dev/local/restore_db.sh"
-docker-compose stop db
+docker compose up -d db
+docker compose run db bash -c "/srv/bin/dev/local/restore_db.sh"
+docker compose stop db
diff --git a/dev/restore_db_hard.sh b/dev/restore_db_hard.sh
index c6017d8..cf43637 100755
--- a/dev/restore_db_hard.sh
+++ b/dev/restore_db_hard.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-docker-compose stop
+docker compose stop
 sudo rm -rf var/lib/postgresql/*
 # sudo rm -rf var/lib/mysql/*
 ./bin/dev/restore_db.sh
diff --git a/dev/restore_db_only.sh b/dev/restore_db_only.sh
index ffdec67..bf9cbef 100755
--- a/dev/restore_db_only.sh
+++ b/dev/restore_db_only.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose exec db /srv/bin/dev/local/restore_db.sh
+docker compose exec db /srv/bin/dev/local/restore_db.sh
diff --git a/dev/up.sh b/dev/up.sh
index 6263e27..59a620a 100755
--- a/dev/up.sh
+++ b/dev/up.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose -f docker-compose.yml -f env/dev.yml up
+docker compose -f docker compose.yml -f env/dev.yml up
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 272e516..ba9cc8a 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Always remove intermediate containers and build app in dev mode
-docker-compose -f docker-compose.yml -f env/build.yml build --force-rm --no-cache
+docker compose -f docker compose.yml -f env/build.yml build --force-rm --no-cache
 # Delete all stopped containers (including data-only containers)
 docker rm $(docker ps -a -q)
 # Delete all 'untagged/dangling' (<none>) images
 docker rmi $(docker images -q -f dangling=true)
 # restart app container
-docker-compose restart app
+docker compose restart app
diff --git a/misc/fix/fs_migrate.sh b/misc/fix/fs_migrate.sh
index 9ec9fcf..62572ff 100755
--- a/misc/fix/fs_migrate.sh
+++ b/misc/fix/fs_migrate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-docker-compose stop
+docker compose stop
 mv data var
 mkdir var/lib
 sudo mv var/postgresql var/lib
diff --git a/misc/gulp.sh b/misc/gulp.sh
index dcff3d0..9a5aed0 100755
--- a/misc/gulp.sh
+++ b/misc/gulp.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py gulp
+docker compose run app python /srv/app/manage.py gulp
diff --git a/misc/poll_twitter.sh b/misc/poll_twitter.sh
index fc4b929..9b84b06 100755
--- a/misc/poll_twitter.sh
+++ b/misc/poll_twitter.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose exec -T app python /srv/app/manage.py poll_twitter --force
+docker compose exec -T app python /srv/app/manage.py poll_twitter --force
diff --git a/mysql/backup.sh b/mysql/backup.sh
index 965bacd..733dcfa 100755
--- a/mysql/backup.sh
+++ b/mysql/backup.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose exec db bash -c 'mysqldump  --add-drop-database --all-databases -uroot -p"$MYSQL_ROOT_PASSWORD" | gzip > /srv/backup/mysql.sql.gz' 
+docker compose exec db bash -c 'mysqldump  --add-drop-database --all-databases -uroot -p"$MYSQL_ROOT_PASSWORD" | gzip > /srv/backup/mysql.sql.gz'
diff --git a/mysql/restore_db.sh b/mysql/restore_db.sh
index 45d75d9..3153e1a 100755
--- a/mysql/restore_db.sh
+++ b/mysql/restore_db.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose exec -T db bash -c 'gunzip < /srv/backup/mysql.sql.gz | mysql -uroot -p"$MYSQL_ROOT_PASSWORD"'
+docker compose exec -T db bash -c 'gunzip < /srv/backup/mysql.sql.gz | mysql -uroot -p"$MYSQL_ROOT_PASSWORD"'
diff --git a/nginx/ps.sh b/nginx/ps.sh
index 37909db..9dbb457 100755
--- a/nginx/ps.sh
+++ b/nginx/ps.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/nginx.yml ps
\ No newline at end of file
+docker compose -f docker compose.yml -f env/nginx.yml ps
\ No newline at end of file
diff --git a/nginx/up.sh b/nginx/up.sh
index f43e749..013ea48 100755
--- a/nginx/up.sh
+++ b/nginx/up.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/nginx.yml up
\ No newline at end of file
+docker compose -f docker compose.yml -f env/nginx.yml up
\ No newline at end of file
diff --git a/prod/backup_db.sh b/prod/backup_db.sh
index 91d789a..083adbd 100755
--- a/prod/backup_db.sh
+++ b/prod/backup_db.sh
@@ -1,3 +1,3 @@
  #!/bin/sh
 
-docker-compose run db /srv/bin/prod/local/backup_db.sh
+docker compose run db /srv/bin/prod/local/backup_db.sh
diff --git a/prod/collectstatic.sh b/prod/collectstatic.sh
index 452b5d0..a0a5582 100755
--- a/prod/collectstatic.sh
+++ b/prod/collectstatic.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py collectstatic --no-input
+docker compose run app python /srv/app/manage.py collectstatic --no-input
 
 sudo chown -R www-data: var/media var/static
diff --git a/prod/migrate.sh b/prod/migrate.sh
index b561bbf..722aa17 100755
--- a/prod/migrate.sh
+++ b/prod/migrate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py migrate
+docker compose run app python /srv/app/manage.py migrate
diff --git a/prod/up.sh b/prod/up.sh
index 57e2ced..14c0d1d 100755
--- a/prod/up.sh
+++ b/prod/up.sh
@@ -6,4 +6,4 @@ if [ "$1" = "-d" ]; then
     options=$options" -d";
 fi
 
-docker-compose -f docker-compose.yml -f env/prod.yml up $options
+docker compose -f docker compose.yml -f env/prod.yml up $options
diff --git a/prod/upgrade.sh b/prod/upgrade.sh
index 7cfef1d..228ace5 100755
--- a/prod/upgrade.sh
+++ b/prod/upgrade.sh
@@ -33,22 +33,22 @@ while [ "$1" != "" ]; do
             ./bin/prod/update.sh -hr
             ;;
         -m | --migrate)
-            docker-compose exec app python /srv/app/manage.py migrate --noinput
+            docker compose exec app python /srv/app/manage.py migrate --noinput
             ;;
         -i | --install)
-            docker-compose exec app poetry install --no-root
+            docker compose exec app poetry install --no-root
             ;;
         -f | --front)
-            docker-compose exec app python /srv/app/manage.py build-front
+            docker compose exec app python /srv/app/manage.py build-front
             ;;
         -fi | --front-install)
-            docker-compose exec app python /srv/app/manage.py build-front --force-npm --force-bower
+            docker compose exec app python /srv/app/manage.py build-front --force-npm --force-bower
             ;;
         -d | --doc)
-            docker-compose exec app bash /srv/doc/build.sh
+            docker compose exec app bash /srv/doc/build.sh
             ;;
         -c | --collect)
-            docker-compose exec app python manage.py collectstatic --noinput
+            docker compose exec app python manage.py collectstatic --noinput
             ;;
         -r | --reload)
             touch app/wsgi.py
diff --git a/staging/up.sh b/staging/up.sh
index bd62763..9d5d10b 100755
--- a/staging/up.sh
+++ b/staging/up.sh
@@ -6,4 +6,4 @@ if [ "$1" = "-d" ]; then
     options=$options" -d";
 fi
 
-docker-compose -f docker-compose.yml -f env/staging.yml up $options
+docker compose -f docker compose.yml -f env/staging.yml up $options
diff --git a/test/ps.sh b/test/ps.sh
index 1637346..2ed374e 100644
--- a/test/ps.sh
+++ b/test/ps.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/dev.yml -f env/selenium.yml ps
\ No newline at end of file
+docker compose -f docker compose.yml -f env/dev.yml -f env/selenium.yml ps
\ No newline at end of file
diff --git a/test/up.sh b/test/up.sh
index 9219ce7..b8a9811 100755
--- a/test/up.sh
+++ b/test/up.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/dev.yml -f env/selenium.yml up
\ No newline at end of file
+docker compose -f docker compose.yml -f env/dev.yml -f env/selenium.yml up
\ No newline at end of file
diff --git a/worker/ps.sh b/worker/ps.sh
index 1a0e327..3d16205 100644
--- a/worker/ps.sh
+++ b/worker/ps.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/worker.yml ps
\ No newline at end of file
+docker compose -f docker compose.yml -f env/worker.yml ps
\ No newline at end of file
diff --git a/worker/up.sh b/worker/up.sh
index 0039f5e..053765e 100644
--- a/worker/up.sh
+++ b/worker/up.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose -f docker-compose.yml -f env/worker.yml up
\ No newline at end of file
+docker compose -f docker compose.yml -f env/worker.yml up
\ No newline at end of file