From a5faca87aa6011b5c59105b43b08f3471172f180 Mon Sep 17 00:00:00 2001 From: Kevin Dang <77701718+kevinthedang@users.noreply.github.com> Date: Fri, 18 Apr 2025 19:42:18 -0700 Subject: [PATCH] Fix: missing model env for docker (#172) --- .github/workflows/build.yml | 2 ++ .github/workflows/coverage.yml | 1 + .github/workflows/deploy.yml | 1 + .github/workflows/test.yml | 1 + docker-compose.yml | 3 ++- package-lock.json | 4 ++-- package.json | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63eeb00..971d2cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env + echo MODEL = ${{ secrets.MODEL }} >> .env echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env @@ -61,6 +62,7 @@ jobs: echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env + echo MODEL = ${{ secrets.MODEL }} >> .env echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8693837..a1b74f9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -30,6 +30,7 @@ jobs: echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env + echo MODEL = ${{ secrets.MODEL }} >> .env echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 796905e..43e88bc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,6 +21,7 @@ jobs: echo CLIENT_TOKEN = ${{ secrets.CLIENT }} >> .env echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env + echo MODEL = ${{ secrets.MODEL }} >> .env echo DISCORD_IP = ${{ secrets.DISCORD_IP }} >> .env echo SUBNET_ADDRESS = ${{ secrets.SUBNET_ADDRESS }} >> .env echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d68e6f..6be8b0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,6 +41,7 @@ jobs: echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env + echo MODEL = ${{ secrets.MODEL }} >> .env echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env diff --git a/docker-compose.yml b/docker-compose.yml index 62fbb78..442fc5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,11 +7,12 @@ services: build: ./ # find docker file in designated path container_name: discord restart: always # rebuild container always - image: kevinthedang/discord-ollama:0.8.3 + image: kevinthedang/discord-ollama:0.8.4 environment: CLIENT_TOKEN: ${CLIENT_TOKEN} OLLAMA_IP: ${OLLAMA_IP} OLLAMA_PORT: ${OLLAMA_PORT} + MODEL: ${MODEL} REDIS_IP: ${REDIS_IP} REDIS_PORT: ${REDIS_PORT} networks: diff --git a/package-lock.json b/package-lock.json index 3eccfd6..4b3ac45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "discord-ollama", - "version": "0.8.3", + "version": "0.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "discord-ollama", - "version": "0.8.3", + "version": "0.8.4", "license": "ISC", "dependencies": { "discord.js": "^14.18.0", diff --git a/package.json b/package.json index 0369d23..3f6b763 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "discord-ollama", - "version": "0.8.3", + "version": "0.8.4", "description": "Ollama Integration into discord", "main": "build/index.js", "exports": "./build/index.js",