Merge pull request #461 from Zippy-boy/main

Rework of docker and docker compose

Author: kercre123

.dockerignore

@@ -0,0 +1,29 @@
+.git
+.github
+.idea
+.vscode
+*.log
+*.tmp
+*.swp
+*.swo
+Dockerfile
+docker-compose.yml
+docker-compose.yaml
+compose.yml
+compose.yaml
+compose.override.yml
+node_modules
+vendor
+vosk
+stt
+whisper.cpp
+vector-cloud/build
+chipper/session-certs
+chipper/jdocs
+chipper/apiConfig.json
+chipper/botConfig.json
+chipper/customIntents.json
+chipper/pico.key
+chipper/useepod
+chipper/source.sh
+.env

.github/workflows/docker-publish.yml

@@ -6,8 +6,6 @@ name: Docker
 # documentation.
 
 on:
-  schedule:
-    - cron: '25 22 * * *'
   push:
     branches: [ "main" ]
     # Publish semver tags as releases.
@@ -96,4 +94,4 @@ jobs:
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}

compose.yaml

@@ -1,18 +1,26 @@
 services:
   wire-pod:
+    container_name: wire-pod
     hostname: escapepod
     image: ghcr.io/kercre123/wire-pod:main
     restart: unless-stopped
+    environment:
+      WIREPOD_DATA_DIR: /data
     ports:
-      - 443:443
-      - 8080:8080
-      - 80:80
-      - 8084:8084
+      - "80:80"
+      - "443:443"
+      - "8080:8080"
+      - "8084:8084"
     volumes:
-      - wire-pod-data:/chipper/
-      - wire-pod-model:/vosk/
+      - wire-pod-data:/data
+      - wire-pod-images:/images
+    healthcheck:
+      test: [ "CMD", "curl", "-fsS", "http://localhost:8080/ok" ]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
 volumes:
   wire-pod-data:
     driver: local
-  wire-pod-model:
-    driver: local

docker/default-source.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+export DEBUG_LOGGING="true"
+export STT_SERVICE="vosk"
+export STT_LANGUAGE="en-US"
+export USE_INBUILT_BLE="false"

docker/entrypoint.sh

@@ -0,0 +1,148 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+APP_ROOT="/opt/wire-pod"
+DATA_ROOT="${WIREPOD_DATA_DIR:-/data}"
+DEFAULT_SOURCE="${APP_ROOT}/docker/default-source.sh"
+
+mkdir -p "${DATA_ROOT}"
+
+link_dir() {
+    local rel_path="$1"
+    local src_path="${APP_ROOT}/${rel_path}"
+    local dest_path="${DATA_ROOT}/${rel_path}"
+
+    mkdir -p "$(dirname "${dest_path}")"
+
+    if [ ! -d "${dest_path}" ]; then
+        if [ -d "${src_path}" ]; then
+            cp -a "${src_path}" "${dest_path}"
+        else
+            mkdir -p "${dest_path}"
+        fi
+    fi
+
+    if [ -e "${src_path}" ] && [ ! -L "${src_path}" ]; then
+        rm -rf "${src_path}"
+    fi
+
+    ln -sfn "${dest_path}" "${src_path}"
+}
+
+link_file() {
+    local rel_path="$1"
+    local src_path="${APP_ROOT}/${rel_path}"
+    local dest_path="${DATA_ROOT}/${rel_path}"
+
+    mkdir -p "$(dirname "${dest_path}")"
+
+    if [ ! -e "${dest_path}" ]; then
+        if [ -f "${src_path}" ]; then
+            cp -a "${src_path}" "${dest_path}"
+        else
+            : >"${dest_path}"
+        fi
+    fi
+
+    if [ -e "${src_path}" ] && [ ! -L "${src_path}" ]; then
+        rm -f "${src_path}"
+    fi
+
+    ln -sfn "${dest_path}" "${src_path}"
+}
+
+link_file_with_default() {
+    local rel_path="$1"
+    local default_path="$2"
+    local src_path="${APP_ROOT}/${rel_path}"
+    local dest_path="${DATA_ROOT}/${rel_path}"
+
+    mkdir -p "$(dirname "${dest_path}")"
+
+    if [ ! -e "${dest_path}" ]; then
+        if [ -n "${default_path}" ] && [ -f "${default_path}" ]; then
+            cp -a "${default_path}" "${dest_path}"
+        elif [ -f "${src_path}" ]; then
+            cp -a "${src_path}" "${dest_path}"
+        else
+            : >"${dest_path}"
+        fi
+    fi
+
+    if [ -e "${src_path}" ] && [ ! -L "${src_path}" ]; then
+        rm -f "${src_path}"
+    fi
+
+    ln -sfn "${dest_path}" "${src_path}"
+}
+
+persist_directories() {
+    link_dir certs
+    link_dir stt
+    link_dir vosk
+    link_dir whisper.cpp
+    link_dir vector-cloud/build
+    link_dir chipper/jdocs
+    link_dir chipper/plugins
+    link_dir chipper/session-certs
+}
+
+persist_files() {
+    link_file chipper/apiConfig.json
+    link_file chipper/botConfig.json
+    link_file chipper/customIntents.json
+    link_file chipper/pico.key
+    link_file chipper/useepod
+    link_file_with_default chipper/source.sh "${DEFAULT_SOURCE}"
+}
+
+update_export() {
+    local key="$1"
+    local value="$2"
+    local file_path="$3"
+
+    local escaped
+    escaped=$(printf '%s' "${value}" | sed 's/[\\&/]/\\&/g')
+
+    if grep -q "^export ${key}=" "${file_path}"; then
+        sed -i "s/^export ${key}=.*/export ${key}=\"${escaped}\"/" "${file_path}"
+    else
+        printf 'export %s="%s"\n' "${key}" "${value}" >>"${file_path}"
+    fi
+}
+
+apply_env_overrides() {
+    local source_file="${APP_ROOT}/chipper/source.sh"
+
+    if [ -n "${WIREPOD_DEBUG_LOGGING:-}" ]; then
+        update_export "DEBUG_LOGGING" "${WIREPOD_DEBUG_LOGGING}" "${source_file}"
+    fi
+
+    if [ -n "${WIREPOD_STT_SERVICE:-}" ]; then
+        update_export "STT_SERVICE" "${WIREPOD_STT_SERVICE}" "${source_file}"
+    fi
+
+    if [ -n "${WIREPOD_STT_LANGUAGE:-}" ]; then
+        update_export "STT_LANGUAGE" "${WIREPOD_STT_LANGUAGE}" "${source_file}"
+    fi
+
+    if [ -n "${WIREPOD_USE_INBUILT_BLE:-}" ]; then
+        update_export "USE_INBUILT_BLE" "${WIREPOD_USE_INBUILT_BLE}" "${source_file}"
+    fi
+
+    if [ -n "${WIREPOD_PICOVOICE_APIKEY:-}" ]; then
+        update_export "PICOVOICE_APIKEY" "${WIREPOD_PICOVOICE_APIKEY}" "${source_file}"
+        printf '%s\n' "${WIREPOD_PICOVOICE_APIKEY}" >"${DATA_ROOT}/chipper/pico.key"
+    fi
+}
+
+persist_directories
+persist_files
+
+if [ ! -e /root/.vosk ]; then
+    ln -sfn /opt/vosk /root/.vosk
+fi
+
+apply_env_overrides
+
+exec "$@"