gmakstutis/openrag
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into fix-port-conflict

Browse source
This commit is contained in:
Sebastián Estévez 2025-11-26 03:48:26 -05:00 • committed by GitHub
commit e23c8fca36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 55 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
.github/workflows/build-multiarch.yml vendored
View file

@ -53,58 +53,63 @@ jobs:
# backend # backend
- image: backend - image: backend
file: ./Dockerfile.backend file: ./Dockerfile.backend
tag: phact/openrag-backend tag: langflowai/openrag-backend
platform: linux/amd64 platform: linux/amd64
arch: amd64 arch: amd64
runs-on: ubuntu-latest-16-cores runs-on: ubuntu-latest-16-cores
- image: backend - image: backend
file: ./Dockerfile.backend file: ./Dockerfile.backend
tag: phact/openrag-backend tag: langflowai/openrag-backend
platform: linux/arm64 platform: linux/arm64
arch: arm64 arch: arm64
runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2] #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
runs-on: RagRunner
# frontend # frontend
- image: frontend - image: frontend
file: ./Dockerfile.frontend file: ./Dockerfile.frontend
tag: phact/openrag-frontend tag: langflowai/openrag-frontend
platform: linux/amd64 platform: linux/amd64
arch: amd64 arch: amd64
runs-on: ubuntu-latest-16-cores runs-on: ubuntu-latest-16-cores
- image: frontend - image: frontend
file: ./Dockerfile.frontend file: ./Dockerfile.frontend
tag: phact/openrag-frontend tag: langflowai/openrag-frontend
platform: linux/arm64 platform: linux/arm64
arch: arm64 arch: arm64
runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2] #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
runs-on: RagRunner
# langflow # langflow
- image: langflow - image: langflow
file: ./Dockerfile.langflow file: ./Dockerfile.langflow
tag: phact/openrag-langflow tag: langflowai/openrag-langflow
platform: linux/amd64 platform: linux/amd64
arch: amd64 arch: amd64
runs-on: ubuntu-latest-16-cores runs-on: ubuntu-latest-16-cores
- image: langflow - image: langflow
file: ./Dockerfile.langflow file: ./Dockerfile.langflow
tag: phact/openrag-langflow tag: langflowai/openrag-langflow
platform: linux/arm64 platform: linux/arm64
arch: arm64 arch: arm64
runs-on: self-hosted #runs-on: self-hosted
runs-on: RagRunner
# opensearch # opensearch
- image: opensearch - image: opensearch
file: ./Dockerfile file: ./Dockerfile
tag: phact/openrag-opensearch tag: langflowai/openrag-opensearch
platform: linux/amd64 platform: linux/amd64
arch: amd64 arch: amd64
runs-on: ubuntu-latest-16-cores runs-on: ubuntu-latest-16-cores
- image: opensearch - image: opensearch
file: ./Dockerfile file: ./Dockerfile
tag: phact/openrag-opensearch tag: langflowai/openrag-opensearch
platform: linux/arm64 platform: linux/arm64
arch: arm64 arch: arm64
runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2] #runs-on: [self-hosted, linux, ARM64, langflow-ai-arm64-2]
#runs-on: self-hosted
runs-on: RagRunner
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}
@ -165,40 +170,40 @@ jobs:
VERSION=${{ steps.version.outputs.version }} VERSION=${{ steps.version.outputs.version }}
# Create versioned tags # Create versioned tags
docker buildx imagetools create -t phact/openrag-backend:$VERSION \ docker buildx imagetools create -t langflowai/openrag-backend:$VERSION \
phact/openrag-backend:$VERSION-amd64 \ langflowai/openrag-backend:$VERSION-amd64 \
phact/openrag-backend:$VERSION-arm64 langflowai/openrag-backend:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-frontend:$VERSION \ docker buildx imagetools create -t langflowai/openrag-frontend:$VERSION \
phact/openrag-frontend:$VERSION-amd64 \ langflowai/openrag-frontend:$VERSION-amd64 \
phact/openrag-frontend:$VERSION-arm64 langflowai/openrag-frontend:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-langflow:$VERSION \ docker buildx imagetools create -t langflowai/openrag-langflow:$VERSION \
phact/openrag-langflow:$VERSION-amd64 \ langflowai/openrag-langflow:$VERSION-amd64 \
phact/openrag-langflow:$VERSION-arm64 langflowai/openrag-langflow:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-opensearch:$VERSION \ docker buildx imagetools create -t langflowai/openrag-opensearch:$VERSION \
phact/openrag-opensearch:$VERSION-amd64 \ langflowai/openrag-opensearch:$VERSION-amd64 \
phact/openrag-opensearch:$VERSION-arm64 langflowai/openrag-opensearch:$VERSION-arm64
# Only update latest tags if version is numeric # Only update latest tags if version is numeric
if [[ "$VERSION" =~ ^[0-9.-]+$ ]]; then if [[ "$VERSION" =~ ^[0-9.-]+$ ]]; then
echo "Updating latest tags for production release: $VERSION" echo "Updating latest tags for production release: $VERSION"
docker buildx imagetools create -t phact/openrag-backend:latest \ docker buildx imagetools create -t langflowai/openrag-backend:latest \
phact/openrag-backend:$VERSION-amd64 \ langflowai/openrag-backend:$VERSION-amd64 \
phact/openrag-backend:$VERSION-arm64 langflowai/openrag-backend:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-frontend:latest \ docker buildx imagetools create -t langflowai/openrag-frontend:latest \
phact/openrag-frontend:$VERSION-amd64 \ langflowai/openrag-frontend:$VERSION-amd64 \
phact/openrag-frontend:$VERSION-arm64 langflowai/openrag-frontend:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-langflow:latest \ docker buildx imagetools create -t langflowai/openrag-langflow:latest \
phact/openrag-langflow:$VERSION-amd64 \ langflowai/openrag-langflow:$VERSION-amd64 \
phact/openrag-langflow:$VERSION-arm64 langflowai/openrag-langflow:$VERSION-arm64
docker buildx imagetools create -t phact/openrag-opensearch:latest \ docker buildx imagetools create -t langflowai/openrag-opensearch:latest \
phact/openrag-opensearch:$VERSION-amd64 \ langflowai/openrag-opensearch:$VERSION-amd64 \
phact/openrag-opensearch:$VERSION-arm64 langflowai/openrag-opensearch:$VERSION-arm64
else else
echo "Skipping latest tags - version: $VERSION (not numeric)" echo "Skipping latest tags - version: $VERSION (not numeric)"
fi fi

10
Makefile
View file

@ -210,7 +210,7 @@ test-ci:
echo "Pulling latest images..."; \ echo "Pulling latest images..."; \
docker compose -f docker-compose-cpu.yml pull; \ docker compose -f docker-compose-cpu.yml pull; \
echo "Building OpenSearch image override..."; \ echo "Building OpenSearch image override..."; \
docker build --no-cache -t phact/openrag-opensearch:latest -f Dockerfile .; \ docker build --no-cache -t langflowai/openrag-opensearch:latest -f Dockerfile .; \
echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \ echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \
docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \ docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \
echo "Starting docling-serve..."; \ echo "Starting docling-serve..."; \
@ -288,10 +288,10 @@ test-ci-local:
echo "Cleaning up old containers and volumes..."; \ echo "Cleaning up old containers and volumes..."; \
docker compose -f docker-compose-cpu.yml down -v 2>/dev/null || true; \ docker compose -f docker-compose-cpu.yml down -v 2>/dev/null || true; \
echo "Building all images locally..."; \ echo "Building all images locally..."; \
docker build -t phact/openrag-opensearch:latest -f Dockerfile .; \ docker build -t langflowai/openrag-opensearch:latest -f Dockerfile .; \
docker build -t phact/openrag-backend:latest -f Dockerfile.backend .; \ docker build -t langflowai/openrag-backend:latest -f Dockerfile.backend .; \
docker build -t phact/openrag-frontend:latest -f Dockerfile.frontend .; \ docker build -t langflowai/openrag-frontend:latest -f Dockerfile.frontend .; \
docker build -t phact/openrag-langflow:latest -f Dockerfile.langflow .; \ docker build -t langflowai/openrag-langflow:latest -f Dockerfile.langflow .; \
echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \ echo "Starting infra (OpenSearch + Dashboards + Langflow) with CPU containers"; \
docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \ docker compose -f docker-compose-cpu.yml up -d opensearch dashboards langflow; \
echo "Starting docling-serve..."; \ echo "Starting docling-serve..."; \

8
docker-compose-cpu.yml
View file

@ -1,6 +1,6 @@
services: services:
opensearch: opensearch:
image: phact/openrag-opensearch:${OPENRAG_VERSION:-latest} image: langflowai/openrag-opensearch:${OPENRAG_VERSION:-latest}
#build: #build:
# context: . # context: .
# dockerfile: Dockerfile # dockerfile: Dockerfile
@ -44,7 +44,7 @@ services:
- "5601:5601" - "5601:5601"
openrag-backend: openrag-backend:
image: phact/openrag-backend:${OPENRAG_VERSION:-latest} image: langflowai/openrag-backend:${OPENRAG_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.backend # dockerfile: Dockerfile.backend
@ -86,7 +86,7 @@ services:
- ./flows:/app/flows:U,z - ./flows:/app/flows:U,z
openrag-frontend: openrag-frontend:
image: phact/openrag-frontend:${OPENRAG_VERSION:-latest} image: langflowai/openrag-frontend:${OPENRAG_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.frontend # dockerfile: Dockerfile.frontend
@ -101,7 +101,7 @@ services:
langflow: langflow:
volumes: volumes:
- ./flows:/app/flows:U,z - ./flows:/app/flows:U,z
image: phact/openrag-langflow:${LANGFLOW_VERSION:-latest} image: langflowai/openrag-langflow:${LANGFLOW_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.langflow # dockerfile: Dockerfile.langflow

8
docker-compose.yml
View file

@ -1,6 +1,6 @@
services: services:
opensearch: opensearch:
image: phact/openrag-opensearch:${OPENRAG_VERSION:-latest} image: langflowai/openrag-opensearch:${OPENRAG_VERSION:-latest}
#build: #build:
#context: . #context: .
#dockerfile: Dockerfile #dockerfile: Dockerfile
@ -44,7 +44,7 @@ services:
- "5601:5601" - "5601:5601"
openrag-backend: openrag-backend:
image: phact/openrag-backend:${OPENRAG_VERSION:-latest} image: langflowai/openrag-backend:${OPENRAG_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.backend # dockerfile: Dockerfile.backend
@ -88,7 +88,7 @@ services:
gpus: all gpus: all
openrag-frontend: openrag-frontend:
image: phact/openrag-frontend:${OPENRAG_VERSION:-latest} image: langflowai/openrag-frontend:${OPENRAG_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.frontend # dockerfile: Dockerfile.frontend
@ -103,7 +103,7 @@ services:
langflow: langflow:
volumes: volumes:
- ./flows:/app/flows:U,z - ./flows:/app/flows:U,z
image: phact/openrag-langflow:${LANGFLOW_VERSION:-latest} image: langflowai/openrag-langflow:${LANGFLOW_VERSION:-latest}
# build: # build:
# context: . # context: .
# dockerfile: Dockerfile.langflow # dockerfile: Dockerfile.langflow

2
pyproject.toml
View file

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "openrag" name = "openrag"
version = "0.1.38" version = "0.1.39-rc3"
description = "Add your description here" description = "Add your description here"
readme = "README.md" readme = "README.md"
requires-python = ">=3.13" requires-python = ">=3.13"