Merged in docker-compose-v2 (pull request #6738)

R2-2835 Docker compose v2
primeroIMS · Apr 5, 2024 · e86d55e · e86d55e
2 parents f7e6173 + 16cc2f4
commit e86d55e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/ansible/install-docker.yml b/ansible/install-docker.yml
@@ -5,7 +5,4 @@
   roles:
   - 'manage-users'
   - 'quoin.infrastructure.configure_journald'
-  - 'quoin.infrastructure.install_python3_virtualenv'
-  - 'quoin.infrastructure.install_python3_docker'
-  - 'quoin.infrastructure.install_python3_docker_compose'
   - 'quoin.infrastructure.install_docker'
diff --git a/ansible/roles/primero-certbot/files/certbot b/ansible/roles/primero-certbot/files/certbot
@@ -131,7 +131,7 @@ def _main(argv):
     finally:
         shutil.rmtree(host_dir)
     if renewed:
-        nginx_container_name = ''.join([arguments.project_name, '_nginx_1'])
+        nginx_container_name = ''.join([arguments.project_name, '-nginx-1'])
         _check_call(['docker', 'exec', '--interactive', nginx_container_name, 'update-nginx-conf.sh'])
         _check_call(['docker', 'exec', '--interactive', nginx_container_name, 'nginx', '-s', 'reload'])
     return 0

diff --git a/docker/compose.sh b/docker/compose.sh
@@ -4,4 +4,4 @@
 : "${PROJECT_NAME:=primero}"
 
 set -euox
-exec docker-compose -p "${PROJECT_NAME}" --project-directory "../" -f "docker-compose.yml" "${@}"
+exec docker compose -p "${PROJECT_NAME}" --project-directory "../" -f "docker-compose.yml" "${@}"