update llm model, reduce image size

docker/fatt/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 #
 # Install packages
 RUN apk --no-cache -U add \
@@ -21,11 +21,8 @@ RUN apk --no-cache -U add \
     git clone https://github.com/0x4D31/fatt && \
     cd fatt && \
     git checkout c29e553514281e50781f86932b82337a5ada5640 && \
-    #git checkout 45cabf0b8b59162b99a1732d853efb01614563fe && \
-    #git checkout 314cd1ff7873b5a145a51ec4e85f6107828a2c79 && \
     mkdir -p log && \
-    # pyshark >= 0.4.3 breaks fatt
-    pip3 install --break-system-packages pyshark==0.4.2.11 && \
+    pip3 install --break-system-packages pyshark && \
 #
 # Setup configs
     chgrp fatt /usr/bin/dumpcap && \
@@ -34,7 +31,7 @@ RUN apk --no-cache -U add \
 #
 # Clean up
     apk del --purge git \
-                    python3-dev && \
+            python3-dev && \
     rm -rf /root/* \
             /var/cache/apk/* \
             /opt/fatt/.git

docker/galah/Dockerfile

@@ -3,7 +3,7 @@ RUN <<EOF
 apk -U add build-base git
 mkdir -p /opt
 cd /opt
-git clone https://github.com/t3chn0m4g3/galah 
+git clone https://github.com/t3chn0m4g3/galah
 EOF
 WORKDIR /opt/galah
 ENV CGO_ENABLED=1
@@ -13,17 +13,9 @@ go build -o galah ./cmd/galah
 EOF
 #
 FROM alpine:3.20
-#
 COPY --from=builder /opt/galah/ /opt/galah/
 #
-# Setup user, groups and configs
-RUN <<EOF
-apk -U add bash openssl
-addgroup -g 2000 galah
-adduser -S -s /bin/ash -u 2000 -D -g 2000 galah
-EOF
-#
 # Start galah
 WORKDIR /opt/galah
-USER galah:galah
+USER 2000:2000
 CMD ["./entrypoint.sh"]

docker/galah/docker-compose.yml

@@ -21,7 +21,7 @@ services:
     environment:
       LLM_PROVIDER: "ollama"
       LLM_SERVER_URL: "http://ollama.local:11434"
-      LLM_MODEL: "llama3"
+      LLM_MODEL: "llama3.1"
       # LLM_TEMPERATURE: ${GALAH_LLM_TEMPERATURE}
       # LLM_API_KEY: ${GALAH_LLM_API_KEY}
       # LLM_CLOUD_LOCATION: ${GALAH_LLM_CLOUD_LOCATION}

env.example

@@ -126,7 +126,7 @@ BEELZEBUB_OLLAMA_MODEL: "openchat"
 # GALAH_LLM_CLOUD_PROJECT: ""
 GALAH_LLM_PROVIDER: "ollama"
 GALAH_LLM_SERVER_URL: "http://ollama.local:11434"
-GALAH_LLM_MODEL: "llama3"
+GALAH_LLM_MODEL: "llama3.1"
 
 
 ###################################################################################