⬆️(docker compose) use docker compose v2

Docker-compose v1 seems to not work anymore.
Updating to v2 is needed.

Author: kernicPanel

Makefile

@@ -40,7 +40,7 @@ DB_PORT            = 5432
 DOCKER_UID          = $(shell id -u)
 DOCKER_GID          = $(shell id -g)
 DOCKER_USER         = $(DOCKER_UID):$(DOCKER_GID)
-COMPOSE             = DOCKER_USER=$(DOCKER_USER) docker-compose
+COMPOSE             = DOCKER_USER=$(DOCKER_USER) docker compose
 COMPOSE_EXEC        = $(COMPOSE) exec
 COMPOSE_EXEC_APP    = $(COMPOSE_EXEC) app-dev
 COMPOSE_RUN         = $(COMPOSE) run --rm
@@ -127,7 +127,7 @@ run: ## start the wsgi (production) and development server
 	@$(WAIT_DB)
 .PHONY: run
 
-status: ## an alias for "docker-compose ps"
+status: ## an alias for "docker compose ps"
 	@$(COMPOSE) ps
 .PHONY: status
 
@@ -230,7 +230,7 @@ shell: ## connect to database shell
 # -- Database
 
 dbshell: ## connect to database shell
-	docker-compose exec app-dev python manage.py dbshell
+	${COMPOSE_EXEC_APP} python manage.py dbshell
 .PHONY: dbshell
 
 resetdb: ## flush database and create a superuser "admin"

README.md

@@ -17,8 +17,8 @@ Compose](https://docs.docker.com/compose/install) installed on your laptop:
 $ docker -v
   Docker version 20.10.2, build 2291f61
 
-$ docker-compose -v
-  docker-compose version 1.27.4, build 40524192
+$ docker compose version
+  Docker Compose version v2.25.0
 ```
 
 > ⚠️ You may need to run the following commands with `sudo` but this can be

bin/_config.sh

@@ -32,28 +32,28 @@ function _set_user() {
     echo "🙋(user) ID: ${USER_ID}"
 }
 
-# docker_compose: wrap docker-compose command
+# docker_compose: wrap docker compose command
 #
 # usage: docker_compose [options] [ARGS...]
 #
-# options: docker-compose command options
-# ARGS   : docker-compose command arguments
+# options: docker compose command options
+# ARGS   : docker compose command arguments
 function _docker_compose() {
 
     echo "🐳(compose) project: '${COMPOSE_PROJECT}' file: '${COMPOSE_FILE}'"
-    docker-compose \
+    docker compose \
         -p "${COMPOSE_PROJECT}" \
         -f "${COMPOSE_FILE}" \
         --project-directory "${REPO_DIR}" \
         "$@"
 }
 
-# _dc_run: wrap docker-compose run command
+# _dc_run: wrap docker compose run command
 #
 # usage: _dc_run [options] [ARGS...]
 #
-# options: docker-compose run command options
-# ARGS   : docker-compose run command arguments
+# options: docker compose run command options
+# ARGS   : docker compose run command arguments
 function _dc_run() {
     _set_user
 
@@ -65,12 +65,12 @@ function _dc_run() {
     _docker_compose run --rm $user_args "$@"
 }
 
-# _dc_exec: wrap docker-compose exec command
+# _dc_exec: wrap docker compose exec command
 #
 # usage: _dc_exec [options] [ARGS...]
 #
-# options: docker-compose exec command options
-# ARGS   : docker-compose exec command arguments
+# options: docker compose exec command options
+# ARGS   : docker compose exec command arguments
 function _dc_exec() {
     _set_user
 
@@ -84,7 +84,7 @@ function _dc_exec() {
     _docker_compose exec $user_args "$@"
 }
 
-# _django_manage: wrap django's manage.py command with docker-compose
+# _django_manage: wrap django's manage.py command with docker compose
 #
 # usage : _django_manage [ARGS...]
 #

bin/state

@@ -12,7 +12,7 @@ source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
 # shellcheck disable=SC2068
 DOCKER_USER="$(id -u):$(id -g)" \
     PROJECT="${project}" \
-    docker-compose run --rm \
+    docker compose run --rm \
     -e OS_AUTH_URL \
     -e OS_IDENTITY_API_VERSION \
     -e OS_USER_DOMAIN_NAME \

bin/terraform

@@ -12,7 +12,7 @@ source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
 # shellcheck disable=SC2068
 DOCKER_USER="$(id -u):$(id -g)" \
     PROJECT="${project}" \
-    docker-compose run --rm \
+    docker compose run --rm \
     -e OS_AUTH_URL \
     -e OS_IDENTITY_API_VERSION \
     -e OS_USER_DOMAIN_NAME \

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   postgresql:
     image: postgres:12