docker-compose to docker compose

diff --git a/build/doc.sh b/build/doc.sh
index abc248de42a860692c18ba32a5388421557e4848..61d607b10f9c363f6f29094c5fe51603152f440a 100755 (executable)
--- 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 c4157f530e93274eef0c458daeb66e59acac41cb..7cb0907ff556de09aa82eb14f1bb745023079a4d 100755 (executable)
--- 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 b5cda09ecc29d162bdb6e0be7ff5b2954dda8fb7..c0ad0db86080ab27e3b2e3ae56ef0a4fe8fedeae 100755 (executable)
--- 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 5fe3892ccf0a38914b198b3f711078bb0bb1e9f1..fa7c2e82a7e11d1e367cc117a69a33f0961687e6 100755 (executable)
--- 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 cea64eec8a414e6f158ae312002116e623b241d9..63f0df9f98829536117c489cb4e98f974668f26d 100755 (executable)
--- 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 d359a6f6496cf9f0e25b6d1014dfaa9373f73225..9eeec8d4b19fd0aabffa9efb954ea783414614e2 100755 (executable)
--- 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 98ad441b7e315ed2924dd10f0cda7d35679a2d81..6de63c00d2f4d928f7249390dc063ba6947f3c07 100755 (executable)
--- 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 a496f452c13a33b835fc13b0f2623b383c3171c7..0ff82017e0904b18054dc7988712799817c70783 100755 (executable)
--- 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 19a1536d4eb4a45c8a9eb593ba8bd349b3383320..de3badbc4a94b747cf59095a2d406e1f12f756a2 100755 (executable)
--- 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 c6017d8c92061e75dc896e1c33e72d8e4fb4c6d3..cf43637dbac16b5a0d5bc06df4b761a8c29ae94d 100755 (executable)
--- 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 ffdec67792f19bb3802a8b2b01b49037b4cf6316..bf9cbef229c137f556fab9466acbf1d828c89452 100755 (executable)
--- 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 6263e27df7c1a266a18506bb8ee1a7e2dfe12b52..59a620a4610b749297fa183527535a40db4c1365 100755 (executable)
--- 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 272e5168ef250d53e752b11eeefebf6444961607..ba9cc8affb65c8e86b7d2fdc3601ff14c809fdfd 100755 (executable)
--- 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 9ec9fcf17ffc24e708567a6c3e40a9e9f6e34bef..62572ffbdc5c9b9d0f08c4c2623750a977f97615 100755 (executable)
--- 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 dcff3d0b7045ed4e141bade363484bcf789a8704..9a5aed0ef6155ea74a9abb435fd3033ab893fac9 100755 (executable)
--- 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 fc4b929f33abf5caaffc2c61e3e013fff70419f3..9b84b0686242c5053c6536509b2401bad0807d66 100755 (executable)
--- 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 965bacdbb19a2994987150481a150ad5065c01b2..733dcfa9c45810c148c12483159ad5cca11a4d74 100755 (executable)
--- 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 45d75d9544db14ce63fb8d6e7e0b1f4aacec50b9..3153e1a5b2056b7dec22eb9a21f4ae80b5169a9a 100755 (executable)
--- 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 37909db8ac122f5f18c23e07b9e4acf2ede3ef84..9dbb4575143a20d5f48371431a94cdb73024db3a 100755 (executable)
--- 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 f43e749fb5ca1fd05fb6278b0cb7251d657ffd5c..013ea4814cd8dd3578bf0393642a5ac294cfb2b8 100755 (executable)
--- 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 91d789a32af1508ee35695226ff6cf30cb0a4848..083adbd29c3816542410bbca15c05e7860523d6b 100755 (executable)
--- 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 452b5d0f9875890418c4d4b4b7379141bb1bf4a5..a0a5582ff3d12ef45042b1c30c9a52e7aa868f5e 100755 (executable)
--- 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 b561bbfa898dcb92a784e05cf5b4a83274cfd871..722aa175a0bdc00976590aa3548cc83c0c974891 100755 (executable)
--- 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 57e2cedc98c4eaba9bd16645cdfe060aea82985b..14c0d1d0d4fc7ec39471d189a481d9f3bd145188 100755 (executable)
--- 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 7cfef1d49866b900af5000d7e78e79c5b0195189..228ace5d9d564fb8fb7f37d88144240738c83947 100755 (executable)
--- 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 bd62763593a6258311f1ed5eddd641b21ddd47b9..9d5d10be0097854a033ff29b2f66d8cfa93edcbf 100755 (executable)
--- 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 1637346f6de9aa94208ae4710e66dd546147fdad..2ed374e7b86229ac43209a6c84963bc3a013e322 100644 (file)
--- 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 9219ce79f61d17a0869e57a4f99c4e3a38f6427f..b8a98118ecc80b0f4fb5223fe33dbfe512cba451 100755 (executable)
--- 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 1a0e327206e2e564a1bb4ad8270013470d9d40ee..3d16205cdc0d0a5742016e04951290f3008adfb6 100644 (file)
--- 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 0039f5e730b383874c67184ffb4c7dc3a3b5a8fb..053765eff72ab8a850263eaa9d2065cb0dddd937 100644 (file)
--- 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