[PR #4608] [MERGED] Move envconfig and consolidate env vars #73833

Closed
opened 2026-05-05 05:45:35 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/4608
Author: @pdevine
Created: 5/24/2024
Status: Merged
Merged: 5/24/2024
Merged by: @pdevine

Base: mainHead: pdevine/envconfig-move


📝 Commits (5)

📊 Changes

14 files changed (+81 additions, -51 deletions)

View changed files

📝 app/lifecycle/logging.go (+1 -1)
📝 cmd/cmd.go (+21 -20)
📝 cmd/interactive.go (+2 -1)
📝 envconfig/config.go (+43 -15)
📝 envconfig/config_test.go (+0 -0)
📝 gpu/assets.go (+1 -1)
📝 gpu/gpu.go (+1 -1)
📝 llm/memory.go (+1 -1)
📝 llm/server.go (+1 -1)
📝 server/images.go (+1 -1)
📝 server/routes.go (+5 -5)
📝 server/routes_test.go (+2 -2)
📝 server/sched.go (+1 -1)
📝 server/sched_test.go (+1 -1)

📄 Description

This change moves envconfig so that it can be read by both the client and the server and adds descriptions to the various environment variables.

Fixes #4361


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/4608 **Author:** [@pdevine](https://github.com/pdevine) **Created:** 5/24/2024 **Status:** ✅ Merged **Merged:** 5/24/2024 **Merged by:** [@pdevine](https://github.com/pdevine) **Base:** `main` ← **Head:** `pdevine/envconfig-move` --- ### 📝 Commits (5) - [`e6a5d2d`](https://github.com/ollama/ollama/commit/e6a5d2d0bb2682663dfd614874d65e6eb9ceee38) move envconfig - [`d2be93a`](https://github.com/ollama/ollama/commit/d2be93aa1e6f3aab563a8b4ba916f69cda9e02cb) consolidate env vars - [`e213708`](https://github.com/ollama/ollama/commit/e2137087e5600a7baed7c1c41a97613db1506661) formatting - [`3807839`](https://github.com/ollama/ollama/commit/380783910de69b349cef7a1fcd8a898ce789dd91) fix import - [`5ee6d63`](https://github.com/ollama/ollama/commit/5ee6d63f3471b1f598263bd2f8123a0fe07070b8) feed the linter ### 📊 Changes **14 files changed** (+81 additions, -51 deletions) <details> <summary>View changed files</summary> 📝 `app/lifecycle/logging.go` (+1 -1) 📝 `cmd/cmd.go` (+21 -20) 📝 `cmd/interactive.go` (+2 -1) 📝 `envconfig/config.go` (+43 -15) 📝 `envconfig/config_test.go` (+0 -0) 📝 `gpu/assets.go` (+1 -1) 📝 `gpu/gpu.go` (+1 -1) 📝 `llm/memory.go` (+1 -1) 📝 `llm/server.go` (+1 -1) 📝 `server/images.go` (+1 -1) 📝 `server/routes.go` (+5 -5) 📝 `server/routes_test.go` (+2 -2) 📝 `server/sched.go` (+1 -1) 📝 `server/sched_test.go` (+1 -1) </details> ### 📄 Description This change moves `envconfig` so that it can be read by both the client and the server and adds descriptions to the various environment variables. Fixes #4361 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-05 05:45:35 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#73833