Commit 20c737f

committed

updates to work via internalip:port

1 parent 3d6b77d commit 20c737fCopy full SHA for 20c737f

File tree

-214

lines changed

-214

lines changed

Lines changed: 0 additions & 22 deletions

This file was deleted.

Lines changed: 0 additions & 28 deletions

This file was deleted.

Lines changed: 5 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,36 +1,12 @@`
`1`		`-version: '3.8'`
`2`		`-`
`3`	`1`	`services:`
`4`		`- ollama:`
`5`		`- image: ollama/ollama:latest`
`6`		`- container_name: ollama`
`7`		`- volumes:`
`8`		`- - ollama_data:/root/.ollama`
`9`		`- ports:`
`10`		`- - "11434:11434"`
`11`		`-`
`12`	`2`	`api:`
	`3`	`+ # image: gitmotion/ollama-api-server:latest`
`13`	`4`	`build: .`
`14`	`5`	`container_name: ollama-api`
	`6`	`+ ports:`
	`7`	`+ - "${PORT_EXTERNAL:-7777}:7777"`
`15`	`8`	`environment:`
`16`	`9`	`- PORT=7777`
`17`		`- - OLLAMA_BASE_URL=http://ollama:11434`
	`10`	`+ - OLLAMA_BASE_URL=http://127.0.0.1:11434`
`18`	`11`	`- CORS_ORIGIN=*`
`19`		`- - API_KEYS=${API_KEYS:-default-key-1,default-key-2}`
`20`		`- depends_on:`
`21`		`- - ollama`
`22`		`-`
`23`		`- nginx:`
`24`		`- image: nginx:alpine`
`25`		`- container_name: nginx-proxy`
`26`		`- ports:`
`27`		`- - "80:80"`
`28`		`- - "443:443"`
`29`		`- volumes:`
`30`		`- - ./nginx.conf:/etc/nginx/nginx.conf:ro`
`31`		`- - ./certs:/etc/nginx/certs:ro`
`32`		`- depends_on:`
`33`		`- - api`
`34`		`-`
`35`		`-volumes:`
`36`		`- ollama_data:`
	`12`	`+ - API_KEYS=${API_KEYS:-default-key-1,default-key-2}`

Lines changed: 0 additions & 133 deletions

This file was deleted.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,6 @@ app.get('/health', (req, res) => {`
`42`	`42`	`res.json({ status: 'ok' });`
`43`	`43`	`});`
`44`	`44`
`45`		`-app.listen(config.port, () => {`
	`45`	`+app.listen(config.port, '0.0.0.0',() => {`
`46`	`46`	console.log(`Server running on port ${config.port}`);
`47`	`47`	`});`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`export const config = {`
`2`		`- port: process.env.PORT \|\| 7777,`
	`2`	`+ port: Number(process.env.PORT) \|\| 7777,`
`3`	`3`	`ollamaBaseUrl: process.env.OLLAMA_BASE_URL \|\| 'http://localhost:11434',`
`4`	`4`	`corsOrigin: process.env.CORS_ORIGIN \|\| '*',`
`5`	`5`	`apiKeys: (process.env.API_KEYS \|\| '').split(',').filter(key => key.length > 0)`

Comments

(0)