Refactor QSV installation by creating a dedicated script for architecture detection and installation, improving maintainability and clarity.

Author: oguzhan-yilmaz

kdiff-snapshots/Dockerfile

@@ -11,33 +11,15 @@ ENV QSV_VER="8.1.1"
 USER root
 RUN apt-get update -y \
     && apt-get install -y wget gpg \
-    && wget -O - https://dathere.github.io/qsv-deb-releases/qsv-deb.gpg | sudo gpg --dearmor -o /usr/share/keyrings/qsv-deb.gpg \
-    && echo "deb [signed-by=/usr/share/keyrings/qsv-deb.gpg] https://dathere.github.io/qsv-deb-releases ./" | sudo tee /etc/apt/sources.list.d/qsv.list \
-    && apt-get update -y \
     && apt-get install -y \
         inotify-tools ca-certificates \
         curl git unzip jq  \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-
-
 # Install qsv depending on architecture
-RUN set -eux; \
-    echo "Detected platform: ${TARGETPLATFORM}"; \
-    if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
-         apt-get update -y && apt-get install -y qsv; \
-    elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
-        QSV_VER="8.1.1"; \
-        QSV_DOWNLOAD_URL="https://github.com/dathere/qsv/releases/download/${QSV_VER}/qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"; \
-        echo "Downloading QSV from $QSV_DOWNLOAD_URL"; \
-        wget -q "$QSV_DOWNLOAD_URL"; \
-        unzip "qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"; \
-        ls -R; \
-        rm "qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"; \
-    else \
-        echo "Unsupported platform: ${TARGETPLATFORM}" && exit 1; \
-    fi
+COPY  --chown=steampipe:steampipe install-qsv.sh .
+RUN bash install-qsv.sh
 
 # # Install qsv
 # RUN echo "architecture = $(dpkg --print-architecture)" \

kdiff-snapshots/install-qsv.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+#
+# install-qsv.sh — Install qsv depending on CPU architecture (amd64 or arm64)
+#
+# This script installs qsv using the appropriate method for your platform.
+# Requires: bash, wget, unzip, sudo, apt
+#
+# Usage:
+#   chmod +x install-qsv.sh
+#   ./install-qsv.sh
+#
+
+set -euo pipefail
+IFS=$'\n\t'
+
+# --- Functions ---------------------------------------------------------------
+
+log() {
+    # Simple logging helper
+    echo "[INFO] $*"
+}
+
+error_exit() {
+    echo "[ERROR] $*" >&2
+    exit 1
+}
+
+install_qsv_amd64() {
+    log "Detected amd64 architecture. Installing qsv via APT repository..."
+
+    # Import GPG key and add repository
+    wget -qO- https://dathere.github.io/qsv-deb-releases/qsv-deb.gpg \
+        | sudo gpg --dearmor -o /usr/share/keyrings/qsv-deb.gpg
+
+    echo "deb [signed-by=/usr/share/keyrings/qsv-deb.gpg] https://dathere.github.io/qsv-deb-releases ./" \
+        | sudo tee /etc/apt/sources.list.d/qsv.list > /dev/null
+
+    # Update and install qsv
+    sudo apt update -y
+    sudo apt install -y qsv
+
+    log "qsv installation complete (amd64)."
+}
+
+install_qsv_arm64() {
+    log "Detected arm64 architecture. Installing qsv manually..."
+
+    QSV_VER="8.1.1"
+    QSV_DOWNLOAD_URL="https://github.com/dathere/qsv/releases/download/${QSV_VER}/qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"
+
+    log "Downloading QSV version ${QSV_VER} from ${QSV_DOWNLOAD_URL}"
+
+    wget -q "${QSV_DOWNLOAD_URL}"
+    unzip -q "qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"
+    rm "qsv-${QSV_VER}-aarch64-unknown-linux-gnu.zip"
+
+    log "Listing extracted files:"
+    ls -R
+
+    log "qsv installation complete (arm64)."
+}
+
+# --- Main --------------------------------------------------------------------
+
+main() {
+    ARCH="$(uname -m)"
+    log "Detected architecture: ${ARCH}"
+
+    case "${ARCH}" in
+        x86_64|amd64)
+            install_qsv_amd64
+            ;;
+        arm64|aarch64)
+            install_qsv_arm64
+            ;;
+        *)
+            error_exit "Unsupported architecture: ${ARCH}"
+            ;;
+    esac
+}
+ls -R
+main "$@"
+ls -R