diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5eaf08aeb..aff421333 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -65,24 +65,24 @@ jobs: cd ./dial-docker-compose/ci/ollama docker compose up --abort-on-container-exit --exit-code-from test --timeout 300 - run-advanced-v1-smoke-test: - name: Docker compose advanced v1 smoke test + run-advanced-1x-smoke-test: + name: Docker compose advanced 1.x smoke test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: isbang/compose-action@d2bee4f07e8ca410d6b196d00f90c12e7d48c33a # v2.6.0 with: - cwd: "./dial-docker-compose-advanced-v1/ci" + cwd: "./dial-docker-compose-advanced/dial-1.x/ci" up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300" - run-advanced-v2-smoke-test: - name: Docker compose advanced v2 smoke test + run-advanced-2x-smoke-test: + name: Docker compose advanced 2.x smoke test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: isbang/compose-action@d2bee4f07e8ca410d6b196d00f90c12e7d48c33a # v2.6.0 with: - cwd: "./dial-docker-compose-advanced-v2/ci" + cwd: "./dial-docker-compose-advanced/dial-2.x/ci" up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300" build: @@ -92,8 +92,8 @@ jobs: - run-quickstart-application - run-quickstart-addon - run-quickstart-self-hosted-model - - run-advanced-v1-smoke-test - - run-advanced-v2-smoke-test + - run-advanced-1x-smoke-test + - run-advanced-2x-smoke-test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad9118609..7b9869cb3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,24 +66,24 @@ jobs: cd ./dial-docker-compose/ci/ollama docker compose up --abort-on-container-exit --exit-code-from test --timeout 300 - run-advanced-v1-smoke-test: - name: Docker compose advanced v1 smoke test + run-advanced-1x-smoke-test: + name: Docker compose advanced 1.x smoke test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: isbang/compose-action@d2bee4f07e8ca410d6b196d00f90c12e7d48c33a # v2.6.0 with: - cwd: "./dial-docker-compose-advanced-v1/ci" + cwd: "./dial-docker-compose-advanced/dial-1.x/ci" up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300" - run-advanced-v2-smoke-test: - name: Docker compose advanced v2 smoke test + run-advanced-2x-smoke-test: + name: Docker compose advanced 2.x smoke test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: isbang/compose-action@d2bee4f07e8ca410d6b196d00f90c12e7d48c33a # v2.6.0 with: - cwd: "./dial-docker-compose-advanced-v2/ci" + cwd: "./dial-docker-compose-advanced/dial-2.x/ci" up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300" build-and-deploy: @@ -93,8 +93,8 @@ jobs: - run-quickstart-application - run-quickstart-addon - run-quickstart-self-hosted-model-ollama - - run-advanced-v1-smoke-test - - run-advanced-v2-smoke-test + - run-advanced-1x-smoke-test + - run-advanced-2x-smoke-test runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 diff --git a/dial-docker-compose-advanced/README.md b/dial-docker-compose-advanced/README.md new file mode 100644 index 000000000..c36feaf9b --- /dev/null +++ b/dial-docker-compose-advanced/README.md @@ -0,0 +1,19 @@ +# DIAL Advanced Docker Compose + +Production-like Docker Compose stacks with Keycloak authentication, an Admin Panel, and multiple model adapters. + +Two release lines are kept side by side: + +| Folder | Release line | Status | +|---|---|---| +| [`dial-2.x/`](./dial-2.x) | DIAL 2.x | **Current — use this one** | +| [`dial-1.x/`](./dial-1.x) | DIAL 1.x | Legacy — kept for existing 1.x installations | + +Each folder is self-contained: its own `.env`, `core/config.json`, Keycloak realm, and compose files. Run them from inside the folder. + +```bash +cd dial-2.x +docker compose -f docker-compose-base.yml up +``` + +For the minimal quick-start setup (no auth, no Admin Panel), see [`dial-docker-compose/`](../dial-docker-compose) instead. diff --git a/dial-docker-compose-advanced-v1/.env b/dial-docker-compose-advanced/dial-1.x/.env similarity index 100% rename from dial-docker-compose-advanced-v1/.env rename to dial-docker-compose-advanced/dial-1.x/.env diff --git a/dial-docker-compose-advanced-v1/.gitignore b/dial-docker-compose-advanced/dial-1.x/.gitignore similarity index 100% rename from dial-docker-compose-advanced-v1/.gitignore rename to dial-docker-compose-advanced/dial-1.x/.gitignore diff --git a/dial-docker-compose-advanced-v1/README.md b/dial-docker-compose-advanced/dial-1.x/README.md similarity index 78% rename from dial-docker-compose-advanced-v1/README.md rename to dial-docker-compose-advanced/dial-1.x/README.md index d3d9ee87e..48b164ef4 100644 --- a/dial-docker-compose-advanced-v1/README.md +++ b/dial-docker-compose-advanced/dial-1.x/README.md @@ -1,4 +1,6 @@ -# DIAL Docker Compose +# DIAL Docker Compose (Legacy DIAL 1.x) + +> **This is the legacy 1.x stack**, kept for existing installations. For new deployments use [`../dial-2.x`](../dial-2.x). Documentation on [docs.dialx.ai](https://docs.dialx.ai) describes the 2.x stack. 1. Setup model endpoints and keys diff --git a/dial-docker-compose-advanced-v1/ci/docker-compose.yml b/dial-docker-compose-advanced/dial-1.x/ci/docker-compose.yml similarity index 100% rename from dial-docker-compose-advanced-v1/ci/docker-compose.yml rename to dial-docker-compose-advanced/dial-1.x/ci/docker-compose.yml diff --git a/dial-docker-compose-advanced-v1/ci/test/Dockerfile b/dial-docker-compose-advanced/dial-1.x/ci/test/Dockerfile similarity index 100% rename from dial-docker-compose-advanced-v1/ci/test/Dockerfile rename to dial-docker-compose-advanced/dial-1.x/ci/test/Dockerfile diff --git a/dial-docker-compose-advanced-v1/ci/test/app.py b/dial-docker-compose-advanced/dial-1.x/ci/test/app.py similarity index 100% rename from dial-docker-compose-advanced-v1/ci/test/app.py rename to dial-docker-compose-advanced/dial-1.x/ci/test/app.py diff --git a/dial-docker-compose-advanced-v1/ci/test/requirements.txt b/dial-docker-compose-advanced/dial-1.x/ci/test/requirements.txt similarity index 100% rename from dial-docker-compose-advanced-v1/ci/test/requirements.txt rename to dial-docker-compose-advanced/dial-1.x/ci/test/requirements.txt diff --git a/dial-docker-compose-advanced-v1/core/config.json b/dial-docker-compose-advanced/dial-1.x/core/config.json similarity index 100% rename from dial-docker-compose-advanced-v1/core/config.json rename to dial-docker-compose-advanced/dial-1.x/core/config.json diff --git a/dial-docker-compose-advanced-v1/docker-compose-base.yml b/dial-docker-compose-advanced/dial-1.x/docker-compose-base.yml similarity index 100% rename from dial-docker-compose-advanced-v1/docker-compose-base.yml rename to dial-docker-compose-advanced/dial-1.x/docker-compose-base.yml diff --git a/dial-docker-compose-advanced-v1/docker-compose-full.yml b/dial-docker-compose-advanced/dial-1.x/docker-compose-full.yml similarity index 100% rename from dial-docker-compose-advanced-v1/docker-compose-full.yml rename to dial-docker-compose-advanced/dial-1.x/docker-compose-full.yml diff --git a/dial-docker-compose-advanced-v1/keycloak/import/realm-config.json b/dial-docker-compose-advanced/dial-1.x/keycloak/import/realm-config.json similarity index 100% rename from dial-docker-compose-advanced-v1/keycloak/import/realm-config.json rename to dial-docker-compose-advanced/dial-1.x/keycloak/import/realm-config.json diff --git a/dial-docker-compose-advanced-v1/settings/gflog.xml b/dial-docker-compose-advanced/dial-1.x/settings/gflog.xml similarity index 100% rename from dial-docker-compose-advanced-v1/settings/gflog.xml rename to dial-docker-compose-advanced/dial-1.x/settings/gflog.xml diff --git a/dial-docker-compose-advanced-v1/settings/settings.json b/dial-docker-compose-advanced/dial-1.x/settings/settings.json similarity index 100% rename from dial-docker-compose-advanced-v1/settings/settings.json rename to dial-docker-compose-advanced/dial-1.x/settings/settings.json diff --git a/dial-docker-compose-advanced-v2/.env b/dial-docker-compose-advanced/dial-2.x/.env similarity index 100% rename from dial-docker-compose-advanced-v2/.env rename to dial-docker-compose-advanced/dial-2.x/.env diff --git a/dial-docker-compose-advanced-v2/.gitignore b/dial-docker-compose-advanced/dial-2.x/.gitignore similarity index 100% rename from dial-docker-compose-advanced-v2/.gitignore rename to dial-docker-compose-advanced/dial-2.x/.gitignore diff --git a/dial-docker-compose-advanced-v2/README.md b/dial-docker-compose-advanced/dial-2.x/README.md similarity index 100% rename from dial-docker-compose-advanced-v2/README.md rename to dial-docker-compose-advanced/dial-2.x/README.md diff --git a/dial-docker-compose-advanced-v2/ci/docker-compose.yml b/dial-docker-compose-advanced/dial-2.x/ci/docker-compose.yml similarity index 100% rename from dial-docker-compose-advanced-v2/ci/docker-compose.yml rename to dial-docker-compose-advanced/dial-2.x/ci/docker-compose.yml diff --git a/dial-docker-compose-advanced-v2/ci/test/Dockerfile b/dial-docker-compose-advanced/dial-2.x/ci/test/Dockerfile similarity index 100% rename from dial-docker-compose-advanced-v2/ci/test/Dockerfile rename to dial-docker-compose-advanced/dial-2.x/ci/test/Dockerfile diff --git a/dial-docker-compose-advanced-v2/ci/test/app.py b/dial-docker-compose-advanced/dial-2.x/ci/test/app.py similarity index 100% rename from dial-docker-compose-advanced-v2/ci/test/app.py rename to dial-docker-compose-advanced/dial-2.x/ci/test/app.py diff --git a/dial-docker-compose-advanced-v2/ci/test/requirements.txt b/dial-docker-compose-advanced/dial-2.x/ci/test/requirements.txt similarity index 100% rename from dial-docker-compose-advanced-v2/ci/test/requirements.txt rename to dial-docker-compose-advanced/dial-2.x/ci/test/requirements.txt diff --git a/dial-docker-compose-advanced-v2/core/config.json b/dial-docker-compose-advanced/dial-2.x/core/config.json similarity index 100% rename from dial-docker-compose-advanced-v2/core/config.json rename to dial-docker-compose-advanced/dial-2.x/core/config.json diff --git a/dial-docker-compose-advanced-v2/docker-compose-base.yml b/dial-docker-compose-advanced/dial-2.x/docker-compose-base.yml similarity index 100% rename from dial-docker-compose-advanced-v2/docker-compose-base.yml rename to dial-docker-compose-advanced/dial-2.x/docker-compose-base.yml diff --git a/dial-docker-compose-advanced-v2/docker-compose-full.yml b/dial-docker-compose-advanced/dial-2.x/docker-compose-full.yml similarity index 100% rename from dial-docker-compose-advanced-v2/docker-compose-full.yml rename to dial-docker-compose-advanced/dial-2.x/docker-compose-full.yml diff --git a/dial-docker-compose-advanced-v2/keycloak/import/realm-config.json b/dial-docker-compose-advanced/dial-2.x/keycloak/import/realm-config.json similarity index 100% rename from dial-docker-compose-advanced-v2/keycloak/import/realm-config.json rename to dial-docker-compose-advanced/dial-2.x/keycloak/import/realm-config.json diff --git a/dial-docker-compose-advanced-v2/settings/gflog.xml b/dial-docker-compose-advanced/dial-2.x/settings/gflog.xml similarity index 100% rename from dial-docker-compose-advanced-v2/settings/gflog.xml rename to dial-docker-compose-advanced/dial-2.x/settings/gflog.xml diff --git a/docs/tutorials/1.developers/0.local-run/2.quick-start-full-stack-advanced.md b/docs/tutorials/1.developers/0.local-run/2.quick-start-full-stack-advanced.md index d8430c3d6..77352510e 100644 --- a/docs/tutorials/1.developers/0.local-run/2.quick-start-full-stack-advanced.md +++ b/docs/tutorials/1.developers/0.local-run/2.quick-start-full-stack-advanced.md @@ -7,8 +7,8 @@ In this tutorial, you will learn how to quickly launch the full DIAL stack: Core Two folders are available depending on the DIAL version line you need: -- [1.x (legacy)](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced-v1/) -- [**2.x (current)**](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced-v2/) +- [1.x (legacy)](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced/dial-1.x/) +- [**2.x (current)**](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced/dial-2.x/) > If you only need Chat with a single sample application or model, see the lighter [quick starts](/docs/tutorials/1.developers/0.local-run/0.quick-start-with-application.md) instead. @@ -18,7 +18,7 @@ Two folders are available depending on the DIAL version line you need: ## Step 1: Get DIAL -[Download](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced-v1/) the `dial-docker-compose-advanced-v1` folder (legacy), or [download](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced-v2/) the `dial-docker-compose-advanced-v2` folder (current) — whichever version line you need. +[Download](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced/dial-1.x/) the `dial-docker-compose-advanced/dial-1.x` folder (legacy), or [download](https://github.com/epam/ai-dial/tree/main/dial-docker-compose-advanced/dial-2.x/) the `dial-docker-compose-advanced/dial-2.x` folder (current) — whichever version line you need. ## Step 2: Configuration @@ -26,7 +26,7 @@ Update `./core/config.json` with your upstream model endpoints and keys. ## Step 3: Launch DIAL -Follow the steps in the folder's README ([v1](https://github.com/epam/ai-dial/blob/main/dial-docker-compose-advanced-v1/README.md) / [v2](https://github.com/epam/ai-dial/blob/main/dial-docker-compose-advanced-v2/README.md)) to choose between `docker-compose-base.yml` (Core, Chat, Admin, Keycloak) and `docker-compose-full.yml` (adds RAG), then run: +Follow the steps in the folder's README ([1.x](https://github.com/epam/ai-dial/blob/main/dial-docker-compose-advanced/dial-1.x/README.md) / [2.x](https://github.com/epam/ai-dial/blob/main/dial-docker-compose-advanced/dial-2.x/README.md)) to choose between `docker-compose-base.yml` (Core, Chat, Admin, Keycloak) and `docker-compose-full.yml` (adds RAG), then run: ```sh docker compose -f up