From c1135ecadfe3f0807c6070dbd7fa014153b3232a Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Thu, 23 Oct 2025 20:40:00 -0700 Subject: [PATCH] cleanup --- script/docker/README.md | 17 +--------- script/docker/compose.yaml | 51 ------------------------------ script/docker/docker-install.bat | 6 ---- script/docker/docker-terminal.bat | 2 -- script/docker/ollama-entrypoint.sh | 16 ---------- 5 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 script/docker/compose.yaml delete mode 100644 script/docker/docker-install.bat delete mode 100644 script/docker/docker-terminal.bat delete mode 100644 script/docker/ollama-entrypoint.sh diff --git a/script/docker/README.md b/script/docker/README.md index ab8ea8a..808db97 100644 --- a/script/docker/README.md +++ b/script/docker/README.md @@ -1,21 +1,6 @@ # How do I use this thing? -This is not a full turnkey setup for Docker yet but gets you most of the way there! +This is not a full turnkey setup for Docker yet -## Setup New Image -`docker build -t meshing-around .` - -there is also [script/docker/docker-install.bat](script/docker/docker-install.bat) which will automate this. - -## Ollama Image with compose -still a WIP -`docker compose up -d` - -## Edit the config.ini in the docker -To edit the config.ini in the docker you can -`docker run -it --entrypoint /bin/bash meshing-around -c "nano /app/config.ini"` - -there is also [script/docker/docker-terminal.bat](script/docker/docker-terminal.bat) which will open nano to edit. -ctl+o to write out and exit editor in shell ## other info 1. Ensure your serial port is properly shared. diff --git a/script/docker/compose.yaml b/script/docker/compose.yaml deleted file mode 100644 index 9c24ca5..0000000 --- a/script/docker/compose.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# OLD Docker Compose configuration for Meshing Around application with optional services. -# This setup includes the main Meshing Around service, with optional Ollama and Prometheus Node Exporter services. -# Adjust device mappings, ports, and configurations as needed for your environment. - -configs: - me_config: - file: ./config.ini # Path to the configuration file for Meshing Around. - # Windows users may need to adjust the path format, e.g., C:/path/to/config.ini - -services: - meshing-around: - build: - context: ../.. - configs: - - source: me_config - target: /app/config.ini - devices: # Optional if using meshtasticd. Pass through radio device. - - /dev/ttyAMA10 # Replace this with your actual device! - #- /dev/ttyUSB0 # Example for USB device - user: 1000:1000 # run as non-root user for better security. - extra_hosts: - # - "host.docker.internal:host-gateway" # Enables access to host services from within the container. - container_name: meshing-around - restart: unless-stopped - #tty: true # Enable only if interactive terminal is needed. - ports: - #- "8420:8420" # web report interface - #- "443:443" # HTTPS interface meshtasticD - environment: - - OLLAMA_API_URL=http://ollama:11434 - - # Uncomment the following service if you want to enable Ollama for local LLM API access. - # ollama: - # image: ollama/ollama:0.5.1 - # volumes: - # - ./ollama:/root/.ollama - # - ./ollama-entrypoint.sh:./entrypoint.sh - # container_name: ollama - # pull_policy: always - # tty: true - # restart: always - # entrypoint: - # - /usr/bin/bash - # - /script/docker/entrypoint.sh - # ports: - # - "11434:11434" - # healthcheck: - # test: "curl -f http://localhost:11434/api/tags | grep -q llama3.2:3b" - # interval: 30s - # timeout: 10s - # retries: 20 \ No newline at end of file diff --git a/script/docker/docker-install.bat b/script/docker/docker-install.bat deleted file mode 100644 index 6f382f8..0000000 --- a/script/docker/docker-install.bat +++ /dev/null @@ -1,6 +0,0 @@ -REM batch file to install docker on windows -REM docker compose up -d -cd ../../ -docker build -t meshing-around . -REM docker-compose up -d -docker run -it --entrypoint /bin/bash meshing-around -c "nano /app/config.ini" \ No newline at end of file diff --git a/script/docker/docker-terminal.bat b/script/docker/docker-terminal.bat deleted file mode 100644 index 5fec0b0..0000000 --- a/script/docker/docker-terminal.bat +++ /dev/null @@ -1,2 +0,0 @@ -REM launch meshing-around container with a terminal -docker run -it --entrypoint /bin/bash meshing-around \ No newline at end of file diff --git a/script/docker/ollama-entrypoint.sh b/script/docker/ollama-entrypoint.sh deleted file mode 100644 index 5af322c..0000000 --- a/script/docker/ollama-entrypoint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Start Ollama in the background. -/bin/ollama serve & -# Record Process ID. -pid=$! - -# Pause for Ollama to start. -sleep 5 - -echo "🔴 Retrieve gemma3:270m model..." -ollama pull gemma3:270m -echo "🟢 Done!" - -# Wait for Ollama process to finish. -wait $pid