Merge branch 'main' into release

backend/install.sh

@@ -11,11 +11,7 @@ VERBOSE=0
 while getopts "d:p:n?s?c?v?h?" opt; do
     case "$opt" in
     h|\?)
-<<<<<<< HEAD
-        echo "A utility script for quickly getting up and started with self-hosted applications."
-=======
         echo "A utility script for quickly getting up and started with self-hosted applicaitons."
->>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
         echo "This script assumes the following:"
         echo "- You have already signed in to the cloudflared CLI application;"
         echo "- You own a domain through Cloudflare;"
@@ -44,7 +40,6 @@ done
 shift $((OPTIND-1))
 
 [ "${1:-}" = "--" ] && shift
-<<<<<<< HEAD
 # TODO: Connect with cross-platform package manager from quaxlyqueen/scripts
 # TODO: Setup ollama (pull LLM best fitting hardware).
 
@@ -109,6 +104,7 @@ createTunnel() {
 	fi
 }
 =======
+=======
 # TODO: Install dependencies.
 # TODO: Add CLI option to enable cloudflared
 
@@ -168,5 +164,4 @@ cloudflared tunnel run $TUNNEL_NAME
 
 if [[ "$VERBOSE" -eq 1 ]]; then
   echo "Complete!"
-fi
->>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
+fi

backend/src/security-layer/Dockerfile

@@ -21,15 +21,12 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o /security-layer
 # But we can document in the Dockerfile what ports
 # the application is going to listen on by default.
 # https://docs.docker.com/reference/dockerfile/#expose
-<<<<<<< HEAD
+
 # TODO: Need to dynamically expose ports based upon ~/.config/one-ai/test.json
 EXPOSE 1111
 EXPOSE 1112
 EXPOSE 1113
 EXPOSE 1114
-=======
-EXPOSE 8000
->>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
 
 # Run
 CMD ["/security-layer"]

backend/src/security-layer/init

@@ -5,10 +5,5 @@ sudo docker rm -f security-layer
 # Build the Docker image.
 sudo docker build --tag security-layer:latest .
 
-<<<<<<< HEAD
 # Create a Docker container from the image and connect host port 1111 to container port 1111, and 1114 to 1114.
-sudo docker run --name security-layer -d -p 1111:1111 -p 1114:1114 security-layer:latest
-=======
-# Create a Docker container from the image and connect host port 8000 to container port 8000.
-sudo docker run --name security-layer -d -p 8000:8000 security-layer:latest
->>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
+sudo docker run --name security-layer -d -p 1111:1111 -p 1114:1114 security-layer:latest