Skip to content

Commit 86355eb

Browse files
author
Radovan Fuchs
committed
LCORE-2247: Move dockerfiles out of root dir
1 parent a9b0851 commit 86355eb

11 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/build_and_push_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
IMAGE_NAMESPACE: lightspeed-core
1010
IMAGE_REGISTRY: quay.io
1111
LATEST_TAG: dev-latest
12-
CONTAINER_FILE: Containerfile
12+
CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
1313

1414
jobs:
1515
build-and-push-dev:

.github/workflows/build_and_push_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
IMAGE_REGISTRY: quay.io
1212
GIT_TAG: ${{ github.ref_name }}
1313
LATEST_TAG: latest
14-
CONTAINER_FILE: Containerfile
14+
CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
1515

1616
jobs:
1717
build-and-push-release:

.github/workflows/build_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
IMAGE_NAME: lightspeed-stack
88
IMAGE_NAMESPACE: lightspeed-core
99
LATEST_TAG: dev-latest
10-
CONTAINER_FILE: Containerfile
10+
CONTAINER_FILE: deploy/lightspeed-stack/Containerfile
1111

1212
jobs:
1313
build-pr:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
- name: hermetic
6969
value: 'true'
7070
- name: dockerfile
71-
value: Containerfile
71+
value: deploy/lightspeed-stack/Containerfile
7272
- name: build-args-file
7373
value: .konflux/build-args-konflux.conf
7474
pipelineSpec:

.tekton/lightspeed-stack-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
- name: hermetic
6161
value: 'true'
6262
- name: dockerfile
63-
value: Containerfile
63+
value: deploy/lightspeed-stack/Containerfile
6464
- name: build-args-file
6565
value: .konflux/build-args-konflux.conf
6666
pipelineSpec:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ docker compose up --build
936936
937937
### Llama-Stack as Library (Library Mode)
938938
939-
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.
939+
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.
940940
941941
**Configuration** (`lightspeed-stack.yaml`):
942942
```yaml
@@ -948,7 +948,7 @@ llama_stack:
948948
**Build and run**:
949949
```bash
950950
# Build lightspeed-core with embedded llama-stack
951-
podman build -f Containerfile -t my-lightspeed-core:latest .
951+
podman build -f deploy/lightspeed-stack/Containerfile -t my-lightspeed-core:latest .
952952
953953
# Run with embedded llama-stack
954954
podman run \
@@ -1001,7 +1001,7 @@ dependencies = [
10011001
]
10021002
```
10031003

1004-
2. Create `Containerfile` in top-level directory like following. Update it as needed:
1004+
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:
10051005
```
10061006
# Latest dev image built from the git main branch (consider pinning a digest for reproducibility)
10071007
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
13281328
13291329
Update these files when you:
13301330
- Add/remove/update Python packages in the project
1331-
- Add/remove/update RPM packages in the Containerfile
1331+
- Add/remove/update RPM packages in `deploy/lightspeed-stack/Containerfile`
13321332
- Change the base image version
13331333
13341334
### Updating Python Dependencies

docker-compose-library.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
lightspeed-stack:
44
build:
55
context: .
6-
dockerfile: Containerfile
6+
dockerfile: deploy/lightspeed-stack/Containerfile
77
platform: linux/amd64
88
container_name: lightspeed-stack
99
ports:

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
llama-stack:
44
build:
55
context: .
6-
dockerfile: test.containerfile
6+
dockerfile: deploy/llama-stack/test.containerfile
77
platform: linux/amd64
88
container_name: llama-stack
99
ports:
@@ -70,7 +70,7 @@ services:
7070
lightspeed-stack:
7171
build:
7272
context: .
73-
dockerfile: Containerfile
73+
dockerfile: deploy/lightspeed-stack/Containerfile
7474
container_name: lightspeed-stack
7575
ports:
7676
- "8080:8080"

0 commit comments

Comments
 (0)