feat: Install salt using onedir packages

tests/basic/test.sh

@@ -18,10 +18,13 @@ ok "container started"
 
 # Check salt version
 echo "==> Checking salt-master version ..."
-docker-exec salt-master --versions
-EXPECTED_VERSION="$(cat VERSION) (Sulfur)"
-CURRENT_VERSION="$(docker-exec salt-master --version)"
-check_equal "${CURRENT_VERSION}" "salt-master ${EXPECTED_VERSION%%-*}" "salt-master --version"
+output=$(docker-exec salt-master --versions)
+echo "${output}"
+
+# shellcheck disable=SC2016
+CURRENT_VERSION="$(echo -n "${output}" | grep -Ei 'salt: ([^\s]+)' | awk '{print $2}')"
+EXPECTED_VERSION="$(cat VERSION)"
+check_equal "${CURRENT_VERSION%%-*}" "${EXPECTED_VERSION%%-*}" "salt-master version"
 
 # Test image calling healthcheck
 echo "==> Executing healthcheck ..."

tests/gpg/test.sh

@@ -14,8 +14,8 @@ trap cleanup EXIT
 # Run test instance
 echo "==> Starting docker-salt-master (${PLATFORM}) config ..."
 start_container_and_wait \
-  --volume "${SCRIPT_PATH}/roots/":/home/salt/data/srv/:ro \
-  --volume "${SCRIPT_PATH}/keys/":/home/salt/data/keys/ \
+  --volume "${SCRIPT_PATH}/roots":/home/salt/data/srv:ro \
+  --volume "${SCRIPT_PATH}/keys":/home/salt/data/keys \
 || error "container started"
 ok "container started"
 

tests/lib/common.sh

@@ -171,8 +171,8 @@ EOF
   --env PUID="$(id -u)" --env PGID="$(id -g)" \
   --env SALT_LOG_LEVEL='info' \
   --platform "${PLATFORM}" ${DOCKER_ARGS[@]} \
-  --volume "${LOGS_DIR}/":/home/salt/data/logs/ \
-  --volume "${SCRIPT_PATH}/config/":/home/salt/data/config/:ro \
+  --volume "${LOGS_DIR}":/home/salt/data/logs \
+  --volume "${SCRIPT_PATH}/config":/home/salt/data/config:ro \
   "${IMAGE_NAME}" || return 1
 
   echo "==> Waiting ${BOOTUP_WAIT_SECONDS} seconds for the container to be ready ..."

tests/salt-api/test.sh

@@ -51,11 +51,15 @@ ok "container started"
 
 # Test salt-api authentication
 echo "==> Getting salt-api token ..."
-SALTAPI_TOKEN=$(curl -sSk "${SALTAPI_URL%/}/login" \
+CURL_OUTPUT="$(curl -sSk "${SALTAPI_URL%/}/login" \
   -H "Accept: application/x-yaml" \
   -d username="${SALTAPI_USER}" \
   -d password="${SALTAPI_PASS}" \
-  -d eauth="${SALTAPI_EAUTH}" | grep 'token:' | cut -d' ' -f 4)
+  -d eauth="${SALTAPI_EAUTH}")"
+echo "${CURL_OUTPUT}"
+
+SALTAPI_TOKEN=
+SALTAPI_TOKEN="$(echo -n "${CURL_OUTPUT}" | grep -Ei 'token: ([^\s]+)' | awk '{print $2}')"
 [ -n "${SALTAPI_TOKEN}" ] || error "salt-api token"
 ok "salt-api token"
 
@@ -89,11 +93,15 @@ ok "container started"
 
 # Test salt-api authentication
 echo "==> Getting salt-api token (pass via file) ..."
-SALTAPI_TOKEN=$(curl -sSk "${SALTAPI_URL%/}/login" \
+CURL_OUTPUT="$(curl -sSk "${SALTAPI_URL%/}/login" \
   -H "Accept: application/x-yaml" \
   -d username="${SALTAPI_USER}" \
   -d password="${SALTAPI_PASS}" \
-  -d eauth="${SALTAPI_EAUTH}" | grep 'token:' | cut -d' ' -f 4)
+  -d eauth="${SALTAPI_EAUTH}")"
+echo "${CURL_OUTPUT}"
+
+SALTAPI_TOKEN=
+SALTAPI_TOKEN="$(echo -n "${CURL_OUTPUT}" | grep -Ei 'token: ([^\s]+)' | awk '{print $2}')"
 [ -n "${SALTAPI_TOKEN}" ] || error "salt-api token"
 ok "salt-api token"