Skip to content

Commit 2b2ec27

Browse files
committed
only push on main merge
Signed-off-by: Ryan Cook <[email protected]>
1 parent 02fe8d7 commit 2b2ec27

File tree

2 files changed

+54
-23
lines changed

2 files changed

+54
-23
lines changed

.github/workflows/image.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ name: Build and Push Docker Image
22

33
on:
44
push:
5-
branches: [ main, working-openshift-two ]
5+
branches: [ main ]
66
pull_request:
77
branches: [ main ]
88

99
jobs:
1010
build-and-push:
11-
environment: ci
1211
runs-on: ubuntu-latest
1312

1413
steps:
1514
- name: Checkout code
1615
uses: actions/checkout@v4
1716

17+
- name: change dir
18+
run: cd demos/rfe-builder
19+
1820
- name: mkdir
1921
run: mkdir ./data
2022

@@ -32,9 +34,18 @@ jobs:
3234
username: ${{ secrets.REDHAT_USERNAME }}
3335
password: ${{ secrets.REDHAT_PASSWORD }}
3436

35-
- name: Build and push Docker image
37+
- name: Build and push Docker image only for merge into main
38+
if: github.ref == 'refs/heads/main'
3639
uses: docker/build-push-action@v5
3740
with:
3841
context: .
3942
push: true
4043
tags: quay.io/redhat-et/rhoai-feature-sizing
44+
45+
- name: Build Docker image for pull requests but don't push
46+
if: github.ref != 'refs/heads/main'
47+
uses: docker/build-push-action@v5
48+
with:
49+
context: .
50+
push: false
51+
tags: quay.io/redhat-et/rhoai-feature-sizing:pr-${{ github.event.pull_request.number }}

demos/rfe-builder/openshift/deployment.yaml.bak

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,58 @@ spec:
1616
app: rhoai-ai-feature-sizing
1717
spec:
1818
containers:
19-
- name: rhoai-app
20-
image: quay.io/gkrumbach07/llama-index-demo/rhoai-ai-feature-sizing:latest
21-
imagePullPolicy: Always
22-
ports:
23-
- containerPort: 4501
24-
name: control-plane
25-
- containerPort: 8000
26-
name: api-server
27-
env:
19+
- env:
20+
- name: LLM_PROVIDER
21+
value: openshift_ai
2822
- name: PYTHONUNBUFFERED
2923
value: "1"
24+
- name: UV_CACHE_DIR
25+
value: /.cache/uv
3026
envFrom:
3127
- configMapRef:
3228
name: rhoai-config
3329
- secretRef:
3430
name: rhoai-secrets
35-
volumeMounts:
36-
- name: uploads-storage
37-
mountPath: /app/uploads
38-
- name: output-storage
39-
mountPath: /app/output
31+
image: quay.io/ambient_code/vteam/rhoai-ai-feature-sizing:latest
32+
imagePullPolicy: Always
33+
name: rhoai-app
34+
ports:
35+
- containerPort: 4501
36+
name: control-plane
37+
protocol: TCP
38+
- containerPort: 8000
39+
name: api-server
40+
protocol: TCP
41+
- containerPort: 3000
42+
name: ui
43+
protocol: TCP
4044
resources:
41-
requests:
42-
memory: "256Mi"
43-
cpu: "100m"
4445
limits:
45-
memory: "1Gi"
46-
cpu: "500m"
46+
cpu: "6"
47+
memory: 12Gi
48+
requests:
49+
cpu: "2"
50+
memory: 12Gi
51+
terminationMessagePath: /dev/termination-log
52+
terminationMessagePolicy: File
53+
volumeMounts:
54+
- mountPath: /.cache
55+
name: cache
56+
- mountPath: /app/uploads
57+
name: uploads-storage
58+
- mountPath: /app/output
59+
name: output-storage
60+
dnsPolicy: ClusterFirst
61+
restartPolicy: Always
62+
schedulerName: default-scheduler
63+
securityContext: {}
64+
terminationGracePeriodSeconds: 30
4765
volumes:
4866
- name: uploads-storage
4967
persistentVolumeClaim:
5068
claimName: rhoai-uploads-pvc
5169
- name: output-storage
5270
persistentVolumeClaim:
53-
claimName: rhoai-output-pvc
71+
claimName: rhoai-output-pvc
72+
- emptyDir: {}
73+
name: cache

0 commit comments

Comments
 (0)