feat(compose): use docker compose (#143)

* feat(compose): use `docker compose` available in docker since 20.10 * docs: update service graph for changes in c0ec093 --------- Co-authored-by: PlaceOS Robot <[email protected]>
PlaceOS · Sep 27, 2024 · fd76312 · fd76312
1 parent 1e43395
commit fd76312
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,9 +82,9 @@ jobs:
           name: logs-${{ matrix.os }}-${{ matrix.version }}-${{ github.sha }}
           path: .logs/*.log
       - name: List service statuses
-        run: docker-compose ps
+        run: docker compose ps
       - name: Check API is reachable
         continue-on-error: true
         run: curl -S --retry 10 --tls-max 1 --insecure https://localhost:8443/api/engine/v2
-      - name: Test raw `docker-compose`
-        run: docker-compose down
+      - name: Test raw `docker compose`
+        run: docker compose down
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 networks:
   placeos:
     name: placeos
@@ -114,7 +112,7 @@ services:
   # Services
 
   rest-api: # Rest API
-    image: ${PLACE_REST_API_REGISTRY:-docker.io}/placeos/rest-api:${PLACE_REST_API_TAG:-latest}
+    image: ${PLACE_REST_API_REGISTRY:-docker.io}/placeos/rest-api:${PLACE_REST_API_TAG:-latest} 
     restart: always
     container_name: rest-api
     hostname: api # Retained as nginx upstream is `api`

diff --git a/images/service-graph.png b/images/service-graph.png
diff --git a/placeos b/placeos
@@ -145,7 +145,7 @@ hard_reset() (
         "Failed to drop Elasticsearch indices."
 
     run_or_abort \
-        "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' restart nginx" \
+        "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' restart nginx" \
         "Restarting nginx..." \
         "Failed to restart nginx." \
         "true"
@@ -312,7 +312,7 @@ start_environment() (
 
 
     run_or_abort \
-        "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' ${PROFILES} pull --quiet" \
+        "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' ${PROFILES} pull --quiet" \
         "Pulling images..." \
         "Failed to pull images."
 
@@ -324,7 +324,7 @@ start_environment() (
         "Failed to create user entity."
 
     run_or_abort \
-        "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' ${PROFILES} up --detach" \
+        "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' ${PROFILES} up --detach" \
         "Bringing up services..." \
         "Failed to start services."
 
@@ -374,7 +374,7 @@ stop_environment() (
     done
 
     run_or_abort \
-        "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' down --remove-orphans" \
+        "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' down --remove-orphans" \
         "Tearing down $PLACEOS_PRODUCT" \
         "Failed to teardown $PLACEOS_PRODUCT"
 )
@@ -586,7 +586,7 @@ update_environment() (
 
     if [[ $restart_services == "true" ]]; then
         run_or_abort \
-            "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' restart" \
+            "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' restart" \
             "Restarting services on ${version}..." \
             "Failed to restart services"
     fi
@@ -742,7 +742,7 @@ uninstall_environment() (
 
     # Stop environment and remove containers, volumes, and images.
     run_or_abort \
-        "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' down --volumes --networks --rmi all" \
+        "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' down --volumes --networks --rmi all" \
         "Stopping ${PLACEOS_PRODUCT}..." \
         "Failed to stop ${PLACEOS_PRODUCT}"
 
@@ -819,7 +819,7 @@ migrate() (
     # shellcheck disable=2086
     ./scripts/run-migration ${clean}
     run_or_abort \
-    "docker-compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' up --detach --remove-orphans" \
+    "docker compose --env-file='${EMPTY_FILE}' --project-directory='${base_path}' up --detach --remove-orphans" \
     "Bringing up services..." \
     "Failed to start services."
 )

diff --git a/scripts/install b/scripts/install
@@ -92,7 +92,7 @@ open_url() (
 
 ensure_command 'git'
 ensure_command 'docker'
-ensure_command 'docker-compose'
+ensure_command 'docker compose'
 
 # 2. Clones the repo into `~/.placeos`, or the PLACEOS_HOME environment variable
 

diff --git a/scripts/run-init-container b/scripts/run-init-container
@@ -6,7 +6,7 @@ base_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/../"
 EMPTY_FILE="$(touch /tmp/placeos-empty-env; echo "/tmp/placeos-empty-env")"
 
 COMPOSE_PROJECT_NAME=placeos \
-    docker-compose \
+    docker compose \
         --env-file="${EMPTY_FILE}" \
         --project-directory="$base_path" \
         run --rm init start
diff --git a/scripts/run-sam-task b/scripts/run-sam-task
@@ -6,7 +6,7 @@ base_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/../"
 EMPTY_FILE="$(touch /tmp/placeos-empty-env; echo "/tmp/placeos-empty-env")"
 
 COMPOSE_PROJECT_NAME=placeos \
-    docker-compose \
+    docker compose \
         --env-file="$EMPTY_FILE" \
         --project-directory="$base_path" \
         run --rm init task "$@"