Merge pull request #1735 from radofuchs/LCORE_2247_move_docker_files

LCORE-2247: Move dockerfiles out of root dir

Author: tisnik

.github/workflows/build_and_push_dev.yaml

@@ -9,7 +9,7 @@ env:
   IMAGE_NAMESPACE: lightspeed-core
   IMAGE_REGISTRY: quay.io
   LATEST_TAG: dev-latest
-  CONTAINER_FILE: Containerfile
+  CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
 
 jobs:
   build-and-push-dev:

.github/workflows/build_and_push_release.yaml

@@ -11,7 +11,7 @@ env:
   IMAGE_REGISTRY: quay.io
   GIT_TAG: ${{ github.ref_name }}
   LATEST_TAG: latest
-  CONTAINER_FILE: Containerfile
+  CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
 
 jobs:
   build-and-push-release:

.github/workflows/build_pr.yaml

@@ -7,7 +7,7 @@ env:
   IMAGE_NAME: lightspeed-stack
   IMAGE_NAMESPACE: lightspeed-core
   LATEST_TAG: dev-latest
-  CONTAINER_FILE: Containerfile
+  CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
 
 jobs:
   build-pr:

.tekton/lightspeed-stack-pull-request.yaml

@@ -68,7 +68,7 @@ spec:
   - name: hermetic
     value: 'true'
   - name: dockerfile
-    value: Containerfile
+    value: deploy/lightspeed-stack/Containerfile
   - name: build-args-file
     value: .konflux/build-args-konflux.conf
   pipelineSpec:

.tekton/lightspeed-stack-push.yaml

@@ -60,7 +60,7 @@ spec:
   - name: hermetic
     value: 'true'
   - name: dockerfile
-    value: Containerfile
+    value: deploy/lightspeed-stack/Containerfile
   - name: build-args-file
     value: .konflux/build-args-konflux.conf
   pipelineSpec:

README.md

@@ -936,7 +936,7 @@ docker compose up --build
 
 ### Llama-Stack as Library (Library Mode)
 
-When embedding llama-stack directly in the container, use the existing `Containerfile` directly (this will not build the llama stack service in a separate container). First modify the `lightspeed-stack.yaml` config to use llama stack in library mode.
+When embedding llama-stack directly in the container, use the existing `deploy/lightspeed-stack/Containerfile` directly (this will not build the llama stack service in a separate container). First modify the `lightspeed-stack.yaml` config to use llama stack in library mode.
 
 **Configuration** (`lightspeed-stack.yaml`):
 ```yaml
@@ -948,7 +948,7 @@ llama_stack:
 **Build and run**:
 ```bash
 # Build lightspeed-core with embedded llama-stack
-podman build -f Containerfile -t my-lightspeed-core:latest .
+podman build -f deploy/lightspeed-stack/Containerfile -t my-lightspeed-core:latest .
 
 # Run with embedded llama-stack
 podman run \
@@ -1001,7 +1001,7 @@ dependencies = [
 ]
 ```
 
-2. Create `Containerfile` in top-level directory like following. Update it as needed:
+2. Create a `Containerfile` in your repository root like the following (see `deploy/lightspeed-stack/Containerfile` in this repo for the upstream image definition). Update it as needed:
 ```
 # Latest dev image built from the git main branch (consider pinning a digest for reproducibility)
 FROM quay.io/lightspeed-core/lightspeed-stack:dev-latest
@@ -1328,7 +1328,7 @@ Konflux builds run in **hermetic mode** (air-gapped from the internet), so all d
 
 Update these files when you:
 - Add/remove/update Python packages in the project
-- Add/remove/update RPM packages in the Containerfile
+- Add/remove/update RPM packages in `deploy/lightspeed-stack/Containerfile`
 - Change the base image version
 
 ### Updating Python Dependencies

Containerfile deploy/lightspeed-stack/ContainerfileContainerfile renamed to deploy/lightspeed-stack/Containerfile

@@ -3,7 +3,7 @@ services:
   lightspeed-stack:
     build:
       context: .
-      dockerfile: Containerfile
+      dockerfile: deploy/lightspeed-stack/Containerfile
     platform: linux/amd64
     container_name: lightspeed-stack
     ports:

test.containerfile deploy/llama-stack/test.containerfiletest.containerfile renamed to deploy/llama-stack/test.containerfile

@@ -3,7 +3,7 @@ services:
   llama-stack:
     build:
       context: .
-      dockerfile: test.containerfile
+      dockerfile: deploy/llama-stack/test.containerfile
     platform: linux/amd64
     container_name: llama-stack
     ports:
@@ -70,7 +70,7 @@ services:
   lightspeed-stack:
     build:
       context: .
-      dockerfile: Containerfile
+      dockerfile: deploy/lightspeed-stack/Containerfile
     container_name: lightspeed-stack
     ports:
       - "8080:8080"