Replace docker-compose command with docker compose & update `time…

…` dep to fix build error (#1218)

.github/workflows/ci.yml

@@ -213,7 +213,7 @@ jobs:
     - name: Start docker containers
       working-directory: util/containers
       run: |
-        docker-compose -f docker-compose.yml up -d \
+        docker compose -f docker-compose.yml up -d \
           tobira-login-handler \
           tobira-meilisearch \
           tobira-ui-test-files

util/scripts/check-system.sh

@@ -67,8 +67,8 @@ fi
 echo
 echo "Checking additional/optional tools for Tobira development..."
 
-printf "▸ docker-compose installed?"
-if has_command docker-compose; then
+printf "▸ docker compose installed?"
+if has_command docker && docker compose &> /dev/null; then
     print_yes
 else
     print_no

util/scripts/db-load-dump.sh

@@ -7,8 +7,8 @@ if ! command -v xz &> /dev/null; then
     >&2 echo "'xz' is not installed!"
     exit 1
 fi
-if ! command -v docker-compose &> /dev/null; then
-    >&2 echo "'docker-compose' is not installed! (Also see './x.sh check-system')"
+if ! (command -v docker &> /dev/null && docker compose &> /dev/null); then
+    >&2 echo "'docker compose' is not installed! (Also see './x.sh check-system')"
     exit 1
 fi
 
@@ -27,7 +27,7 @@ echo "To cancel, ctrl+c! To continue, press enter."
 read -r
 
 set -x
-docker-compose -f "$basedir/../containers/docker-compose.yml" \
+docker compose -f "$basedir/../containers/docker-compose.yml" \
     exec -T tobira-dev-database \
     pg_restore \
     --dbname 'postgresql://tobira:tobira@localhost/postgres' \

x.sh

@@ -32,7 +32,7 @@ if [[ $# -lt 1 ]]; then
     >&2 echo
     >&2 echo "  - ./x.sh containers [start|stop|run]"
     >&2 echo "        Manages all dev containers. To only start/stop some of them, use"
-    >&2 echo "        docker-compose manually in 'util/containers'"
+    >&2 echo "        docker compose manually in 'util/containers'"
     >&2 echo
     >&2 echo "  - ./x.sh db load-dump"
     >&2 echo "        Loads a public DB dump with lots of data."
@@ -41,12 +41,12 @@ fi
 
 # Manage the dev containers
 containers() {
-    if ! command -v docker-compose &> /dev/null; then
-        >&2 echo "'docker-compose' is not installed! (Also see './x.sh check-system')"
+    if ! (command -v docker &> /dev/null && docker compose &> /dev/null); then
+        >&2 echo "'docker compose' is not installed! (Also see './x.sh check-system')"
         exit 1
     fi
 
-    docker_command="docker-compose -f $basedir/util/containers/docker-compose.yml"
+    docker_command="docker compose -f $basedir/util/containers/docker-compose.yml"
     case "$1" in
         "start")
             (set -x; $docker_command up -d)