[UPD] replace docker-compose to docker compose

CHANGELOG.md

@@ -19,6 +19,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Improve format script to help code-generator
 - Improve PyCharm script
 - Support OSX for open-terminal
+- Remove docker-compose and replace by docker compose
 
 ### Fixed
 

Makefile

@@ -935,15 +935,15 @@ clean_test:
 # run docker
 .PHONY: docker_run
 docker_run:
-	docker-compose up
+	docker compose up
 
 .PHONY: docker_run_daemon
 docker_run_daemon:
-	docker-compose up -d
+	docker compose up -d
 
 .PHONY: docker_stop
 docker_stop:
-	docker-compose down
+	docker compose down
 
 .PHONY: docker_restart_daemon
 docker_restart_daemon:
@@ -956,11 +956,11 @@ docker_show_databases:
 
 .PHONY: docker_show_logs_live
 docker_show_logs_live:
-	docker-compose logs -f
+	docker compose logs -f
 
 .PHONY: docker_show_process
 docker_show_process:
-	docker-compose ps
+	docker compose ps
 
 .PHONY: docker_exec_erplibre
 docker_exec_erplibre:

README.md

@@ -31,7 +31,7 @@ First, install dependencies to run docker, check script `./script/install/instal
 The docker volume is bound to the directory name, therefore create a unique directory name and run:
 ```bash
 wget https://raw.githubusercontent.com/ERPLibre/ERPLibre/v1.5.0/docker-compose.yml
-docker-compose up -d
+docker compose up -d
 ```
 
 For more information, read [Docker guide](./docker/README.md).

doc/PRODUCTION.md

@@ -183,8 +183,8 @@ Note, the goal is to call `env['ir.module.module'].update_list()`.
 Restart the docker :
 
 ```bash
-docker-compose down
+docker compose down
-docker-compose up -d
+docker compose up -d
 ```
 
 Revert the command in docker-compose.yml.
@@ -192,7 +192,7 @@ Revert the command in docker-compose.yml.
 You can validate in log the update, you need to find `odoo.modules.loading: updating modules list`, check
 
 ```bash
-docker-compose logs -f
+docker compose logs -f
 ```
 
 ## Update all

docker/README.md

@@ -38,15 +38,15 @@ docker build -f Dockerfile.prod.pkg -t technolibre/erplibre:12.0-pkg .
 Go at the root of this git project.
 ```bash
 cd ERPLibre
-docker-compose -f docker-compose.yml up -d
+docker compose -f docker-compose.yml up -d
 ```
 
 ### Diagnostic Docker-Compose
 
 Show docker-compose information
 ```bash
-docker-compose ps
+docker compose ps
-docker-compose logs IMAGE_NAME
+docker compose logs IMAGE_NAME
 ```
 
 Show docker information
@@ -90,7 +90,7 @@ docker rmi $(docker images -q)
 
 Delete volumes
 ```bash
-docker-compose rm -v
+docker compose rm -v
 ```
 
 Delete containers

docker/entrypoint.sh

@@ -38,7 +38,7 @@ then
 
 elif [[ "$ENV" == "dev" ]] && [  -z ${CURRENT_UID} ]
 then
-    echo 'Please run as follows : CURRENT_UID=$(id -u):$(id -g) docker-compose up'
+    echo 'Please run as follows : CURRENT_UID=$(id -u):$(id -g) docker compose up'
     exit 1
 fi
 

script/docker/docker_build.sh

@@ -69,4 +69,4 @@ docker build ${ARGS} -f Dockerfile.base -t ${ERPLIBRE_DOCKER_BASE_VERSION} .
 docker build ${ARGS} -f Dockerfile.prod.pkg -t ${ERPLIBRE_DOCKER_PROD_VERSION} .
 
 cd -
-docker-compose up -d
+docker compose up -d

script/install/install_debian_10_prod_docker.sh

@@ -2,29 +2,7 @@
 
 # https://docs.docker.com/engine/install/debian/
 # Docker
-sudo apt-get update
+curl -fsSL https://get.docker.com | sh
-sudo apt-get install -y \
-  apt-transport-https \
-  ca-certificates \
-  curl \
-  gnupg-agent \
-  software-properties-common
-
-curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-sudo apt-key fingerprint 0EBFCD88
-sudo add-apt-repository \
-  "deb [arch=amd64] https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable"
-
-sudo apt-get update
-sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-docker --version
-
-# Docker-compose
-sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-docker-compose --version
 
 # nginx
 sudo apt-get install -y nginx

script/install/install_dev_extra_ubuntu.sh

@@ -16,24 +16,8 @@ FLUSH PRIVILEGES;
 EOF
 
         # Install docker
-        sudo apt-get update
+        curl -fsSL https://get.docker.com | sh
-        sudo apt-get install ca-certificates curl gnupg lsb-release
+        dockerd-rootless-setuptool.sh install
-        curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-        echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-        sudo apt-get update
-        sudo apt-get install docker-ce docker-ce-cli containerd.io
-
-        # Run without root
-        #sudo groupadd docker
-        sudo usermod -aG docker "$USER"
-        #newgrp docker
-
-        # Install docker-compose
-        sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-        sudo chmod +x /usr/local/bin/docker-compose
-        else
-            echo "Your version is not supported, only support 18.04 and 20.04 : ${VERSION}"
-        fi
     else
         echo "Your Linux system is not supported, only support Ubuntu 18.04 or Ubuntu 20.04."
     fi

script/install/install_ubuntu_docker.sh

@@ -1,29 +1,8 @@
 #!/usr/bin/env bash
 
 # From https://docs.docker.com/engine/install/ubuntu/
-sudo apt-get update
+# Docker
-sudo apt-get install -y \
+curl -fsSL https://get.docker.com | sh
-  apt-transport-https \
-  ca-certificates \
-  curl \
-  gnupg-agent \
-  software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo apt-key fingerprint 0EBFCD88
-
-sudo add-apt-repository \
-  "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-
-sudo apt-get update
-sudo apt-get install docker-ce docker-ce-cli containerd.io
-docker --version
-
-# Docker-compose
-sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-sudo chmod +x /usr/local/bin/docker-compose
-docker-compose --version
 
 # nginx
 sudo apt-get install -y nginx