fix: populate ARCH and CONTAINER_RUNTIME after upgrade

KieranKaelin · KieranKaelin · commit c6cf2ad16d73 · 2025-03-11T15:11:36.000+01:00
add `--env-file` argument to docker-compose calls
diff --git a/src/env.sh b/src/env.sh
@@ -5,6 +5,7 @@
 
 source ./constants.sh
 source ./util.sh
+source ./patches.sh
 
 env_file_exists() {
   [ -f "${ENV_FILE}" ]
@@ -14,6 +15,8 @@ env_barrier() {
   if ! env_file_exists; then
     error "Initial configuration outstanding (run $(highlight "'./migrator install'"))"
   fi
+
+  v3_20_0_add_arch_and_container_runtime
 }
 
 print_env() {
diff --git a/src/patches.sh b/src/patches.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2022-2024 CYBERTEC PostgreSQL International GmbH <office@cybertec.at>
+
+source ./constants.sh
+source ./util.sh
+
+v3_20_0_add_arch_and_container_runtime() {
+  if [ -z "$(print_env 'ARCH')" ]; then
+    local architecture=""
+    case $(uname -m) in
+      x86_64) architecture="amd64" ;;
+      aarch64|arm64) architecture="arm64" ;;
+      *)
+        error "Unable to detect architecture $(highlight "$(uname -m)")"
+        error "Please file a ticket so we may resolve this issue:"
+        error "    Public:    https://github.com/cybertec-postgresql/cybertec_migrator/issues/new/choose"
+        error "    Customers: https://cybertec.atlassian.net/servicedesk/customer/portal/3/group/4/create/23"
+        exit 1
+        ;;
+    esac
+    set_env_file_variable "ARCH" "$architecture"
+  fi
+
+  if [ -z "$(print_env 'CONTAINER_RUNTIME')" ]; then
+    set_env_file_variable "CONTAINER_RUNTIME" "docker"
+  fi
+}
diff --git a/src/runtime.docker.sh b/src/runtime.docker.sh
@@ -4,19 +4,19 @@
 # SPDX-FileCopyrightText: 2022-2024 CYBERTEC PostgreSQL International GmbH <office@cybertec.at>
 
 runtime_up() {
-  docker compose up -d
+  docker compose --env-file ../.env up -d
 }
 
 runtime_down() {
-  docker compose down
+  docker compose --env-file ../.env down
 }
 
 runtime_pull() {
-  docker compose pull 2>&1 > /dev/null
+  docker compose --env-file ../.env pull 2>&1 > /dev/null
 }
 
 runtime_logs() {
-  docker compose logs --timestamps --tail='all' $1
+  docker compose --env-file ../.env logs --timestamps --tail='all' $1
 }
 
 runtime_load() {
@@ -29,7 +29,7 @@ runtime_run() {
   local mount="${3}"
 
   if [ -n "${mount}" ]; then
-    mount="--mount ${mount}"
+    mount="--volume ${mount}"
   fi
 
   eval "docker run ${mount} ${image} bash -c \"${cmd}\""
diff --git a/src/runtime.sh b/src/runtime.sh
@@ -7,6 +7,7 @@ source ./env.sh
 source ./console.sh
 
 if env_file_exists; then
+  v3_20_0_add_arch_and_container_runtime
   case "$(print_env 'CONTAINER_RUNTIME')" in
     docker) source ./runtime.docker.sh ;;
     podman) source ./runtime.podman.sh ;;
