Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Makefiles/containers-base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,18 @@ endif
################## BUILD SOURCE CONTAINERS ##################

ui-image: validate-container-engine src/Containerfile ## Build container image for the InstructLab UI
$(ECHO_PREFIX) printf " %-12s src/Containerfile\n" "[$(CONTAINER_ENGINE), linux/$(TARGET_IMAGE_ARCH)]"
$(CMD_PREFIX) $(CONTAINER_ENGINE) build --platform linux/$(TARGET_IMAGE_ARCH) -f src/Containerfile -t quay.io/instructlab-ui/ui:$(TAG) .
$(ECHO_PREFIX) printf " %-12s src/Containerfile\n" "[$(CONTAINER_ENGINE)]"
$(CMD_PREFIX) $(CONTAINER_ENGINE) build -f src/Containerfile -t quay.io/instructlab-ui/ui:$(TAG) .
$(CMD_PREFIX) $(CONTAINER_ENGINE) tag quay.io/instructlab-ui/ui:$(TAG) quay.io/instructlab-ui/ui:main
$(CMD_PREFIX) $(CONTAINER_ENGINE) tag quay.io/instructlab-ui/ui:$(TAG) ghcr.io/instructlab/ui/ui:main

ps-image: validate-container-engine pathservice/Containerfile ## Build container image for the InstructLab PathService
$(ECHO_PREFIX) printf " %-12s pathservice/Containerfile\n" "[$(CONTAINER_ENGINE), linux/$(TARGET_IMAGE_ARCH)]"
$(CMD_PREFIX) $(CONTAINER_ENGINE) build --platform linux/$(TARGET_IMAGE_ARCH) -f pathservice/Containerfile -t quay.io/instructlab-ui/pathservice:$(TAG) .
$(ECHO_PREFIX) printf " %-12s pathservice/Containerfile\n" "[$(CONTAINER_ENGINE)]"
$(CMD_PREFIX) $(CONTAINER_ENGINE) build -f pathservice/Containerfile -t quay.io/instructlab-ui/pathservice:$(TAG) .
$(CMD_PREFIX) $(CONTAINER_ENGINE) tag quay.io/instructlab-ui/pathservice:$(TAG) quay.io/instructlab-ui/pathservice:main
$(CMD_PREFIX) $(CONTAINER_ENGINE) tag quay.io/instructlab-ui/pathservice:$(TAG) ghcr.io/instructlab/ui/pathservice:main

healthcheck-sidecar-image: validate-container-engine healthcheck-sidecar/Containerfile ## Build container image for the InstructLab Healthcheck-Sidecar
$(ECHO_PREFIX) printf " %-12s healthcheck-sidecar/Containerfile\n" "[$(CONTAINER_ENGINE), linux/$(TARGET_IMAGE_ARCH)]"
$(ECHO_PREFIX) printf " %-12s healthcheck-sidecar/Containerfile\n" "[$(CONTAINER_ENGINE)]"
$(CMD_PREFIX) $(CONTAINER_ENGINE) build -f healthcheck-sidecar/Containerfile -t quay.io/instructlab-ui/healthcheck-sidecar:$(TAG) healthcheck-sidecar
$(CMD_PREFIX) $(CONTAINER_ENGINE) tag quay.io/instructlab-ui/healthcheck-sidecar:$(TAG) quay.io/instructlab-ui/healthcheck-sidecar:main
23 changes: 23 additions & 0 deletions deploy/k8s/base/doclingserve/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: doclingserve
spec:
replicas: 1
strategy:
type: RollingUpdate
template:
spec:
containers:
- name: doclingserve
image: ghcr.io/ds4sd/docling-serve-cpu:main
imagePullPolicy: Always
resources:
requests:
cpu: 100m
memory: 200Mi
ports:
- name: http
protocol: TCP
containerPort: 5000
restartPolicy: Always
11 changes: 11 additions & 0 deletions deploy/k8s/base/doclingserve/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- deployment.yaml
- service.yaml
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/component: doclingserve
app.kubernetes.io/instance: doclingserve
app.kubernetes.io/name: doclingserve
13 changes: 13 additions & 0 deletions deploy/k8s/base/doclingserve/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: doclingserve
spec:
clusterIP: None
selector:
app.kubernetes.io/component: doclingserve
app.kubernetes.io/instance: doclingserve
app.kubernetes.io/name: doclingserve
ports:
- port: 5000
targetPort: 5000
1 change: 1 addition & 0 deletions deploy/k8s/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ resources:
- namespace.yaml
- ui
- pathservice
- doclingserve
labels:
- includeSelectors: true
pairs:
Expand Down
32 changes: 26 additions & 6 deletions deploy/podman/github/instructlab-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
- name: pathservice
image: ghcr.io/instructlab/ui/pathservice:main
resources:
limits:
cpu: "100m"
memory: "200Mi"
requests:
cpu: "100m"
memory: "200Mi"
Expand All @@ -29,6 +26,32 @@ spec:
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: doclingserve
spec:
replicas: 1
selector:
matchLabels:
app: doclingserve
template:
metadata:
labels:
app: doclingserve
spec:
containers:
- name: doclingserve
image: ghcr.io/ds4sd/docling-serve-cpu:main
resources:
requests:
cpu: "100m"
memory: "200Mi"
ports:
- containerPort: 5000
hostPort: 5000
imagePullPolicy: Always
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: ui
spec:
Expand All @@ -45,9 +68,6 @@ spec:
- name: ui
image: ghcr.io/instructlab/ui/ui:main
resources:
limits:
cpu: "100m"
memory: "200Mi"
requests:
cpu: "100m"
memory: "200Mi"
Expand Down
29 changes: 26 additions & 3 deletions deploy/podman/native/instructlab-ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ spec:
- name: pathservice
image: ghcr.io/instructlab/ui/pathservice:main
resources:
limits:
cpu: "500m"
memory: "500Mi"
requests:
cpu: "1000m"
memory: "1000Mi"
Expand All @@ -29,6 +26,32 @@ spec:
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: doclingserve
spec:
replicas: 1
selector:
matchLabels:
app: doclingserve
template:
metadata:
labels:
app: doclingserve
spec:
containers:
- name: doclingserve
image: ghcr.io/ds4sd/docling-serve-cpu:main
resources:
requests:
cpu: "1000m"
memory: "2000Mi"
ports:
- containerPort: 5000
hostPort: 5000
imagePullPolicy: Always
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: ui
spec:
Expand Down
Loading
Loading