Auto Merge of PR 148 - open-webui-ollama-portracker-mods_2025-08-26T15-05-45

Merged by Trez.One
This commit was merged in pull request #148.
This commit is contained in:
2025-08-26 15:21:32 -04:00
3 changed files with 18 additions and 16 deletions
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v5
uses: actions/checkout@v4
with:
fetch-depth: 1
@@ -81,7 +81,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Fetch base branch
run: |
@@ -146,7 +146,7 @@ jobs:
DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Login to Gitea Container Registry
run: |
@@ -203,7 +203,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
with:
fetch-depth: 1
@@ -280,7 +280,7 @@ jobs:
needs: [cloudflare-dns-setup]
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Install yq
uses: dcarbone/install-yq-action@v1
@@ -330,7 +330,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
- name: Cache tea CLI
id: cache-tea
@@ -376,7 +376,7 @@ jobs:
DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v4
with:
ref: main
+1 -1
View File
@@ -52,7 +52,7 @@
| garage | dxflrs/garage:v2.0.0 |
| garage-webui | khairul169/garage-webui:latest |
| ghost | ghost:latest |
| gitea | gitea/gitea:1.24.3 |
| gitea | gitea/gitea:1.24.5 |
| gitea-db | postgres:14 |
| gitea-runner | gitea/act_runner:latest |
| gitea-sonarqube-bot | justusbunsi/gitea-sonarqube-bot:v0.4.0 |
+10 -8
View File
@@ -1400,11 +1400,7 @@ services:
privileged: true
restart: unless-stopped
volumes:
- bind:
create_host_path: true
source: /var/run/docker.sock
target: /var/run/docker.sock
type: bind
- /var/run/docker.sock:/var/run/docker.sock
dockflare:
container_name: dockflare
environment:
@@ -4303,11 +4299,11 @@ services:
condition: service_started
required: true
environment:
OLLAMA_BASE_URL: http://ollama:11434
OLLAMA_BASE_URLS: http://ollama:11434;http://192.168.1.252:11434
WEBUI_AUTH: false
ENABLE_IMAGE_GENERATION: "true"
AUTOMATIC1111_BASE_URL: http://stable-diffusion-webui:7860
IMAGE_SIZE: "64x64"
IMAGE_SIZE: "1024x1024"
IMAGE_STEPS: "3"
ENABLE_OTEL: true
ENABLE_OTEL_METRICS: true
@@ -4851,9 +4847,13 @@ services:
- 36102:8000
restart: unless-stopped
portracker:
cap_add:
- SYS_PTRACE
- SYS_ADMIN
container_name: portracker
environment:
DATABASE_PATH: /data/portracker.db
DEBUG: false
PORT: 4999
image: mostafawahied/portracker:latest
labels:
@@ -4874,8 +4874,10 @@ services:
homepage.href: https://ports.${MY_TLD}
homepage.icon: sh-portracker.svg
homepage.description: Real-time port monitoring and discovery
network_mode: host
pid: "host"
restart: unless-stopped
security_opt:
- apparmor:unconfined
volumes:
- ${DOCKER_VOLUME_CONFIG}/portracker:/data
- /var/run/docker.sock:/var/run/docker.sock:ro