Skip to content

Commit c24ac33

Browse files
noahmasoudnoahmasoud
authored
Merge branch 'main' into feat/delete-app-endpoint
2 parents 0ae751a + fd69ea5 commit c24ac33

24 files changed

Lines changed: 97 additions & 173 deletions

‎.github/workflows/build-and-publish-image.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Build and Publish Image
33
on:
44
workflow_call:
55
inputs:
6+
service:
7+
required: true
8+
type: string
69
working-directory:
710
required: true
811
type: string
@@ -22,6 +25,7 @@ jobs:
2225
working-directory: ${{ inputs.working-directory }}
2326
run: |
2427
make build \
28+
SERVICE=${{ inputs.service }} \
2529
REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} \
2630
REGISTRY_USER=${{ secrets.ICR_USERNAME }} \
2731
REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
@@ -31,6 +35,7 @@ jobs:
3135
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
3236
run: |
3337
make push \
38+
SERVICE=${{ inputs.service }} \
3439
REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} \
3540
REGISTRY_USER=${{ secrets.ICR_USERNAME }} \
36-
REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
41+
REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}

‎.github/workflows/chatbot-service-image.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ jobs:
1212
name: Build and Publish Image
1313
uses: ./.github/workflows/build-and-publish-image.yml
1414
with:
15-
working-directory: 'services/chatbot'
15+
service: 'chatbot'
16+
working-directory: 'services'
1617
secrets: inherit
1718

1819
scan:
1920
uses: ./.github/workflows/scanner.yml
2021
with:
21-
path: 'services/chatbot'
22+
path: 'services'
23+
service: 'chatbot'
2224
image: 'chatbot-service'
2325
secrets:
2426
ICR_USERNAME: ${{ secrets.ICR_USERNAME }}

‎.github/workflows/common-service-image.yml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.github/workflows/digitize-service.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ jobs:
1212
name: Build and Publish Image
1313
uses: ./.github/workflows/build-and-publish-image.yml
1414
with:
15-
working-directory: 'services/digitize'
15+
service: 'digitize'
16+
working-directory: 'services'
1617
secrets: inherit
1718

1819
scan:
1920
uses: ./.github/workflows/scanner.yml
2021
with:
21-
path: 'services/digitize'
22-
image: 'digitize'
22+
path: 'services'
23+
service: 'digitize'
24+
image: 'digitize-service'
2325
secrets:
2426
ICR_USERNAME: ${{ secrets.ICR_USERNAME }}
2527
ICR_APIKEY: ${{ secrets.ICR_APIKEY }}

‎.github/workflows/image-scanner.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ jobs:
4040
image: digitize-ui
4141
- path: services/chatbot
4242
image: chatbot-service
43-
- path: services/common
44-
image: services-common
4543
- path: services/digitize
4644
image: digitize-service
4745
- path: services/similarity

‎.github/workflows/scanner.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
path:
77
required: false
88
type: string
9+
service:
10+
required: false
11+
type: string
912
# Set skip-image-build to true, to scan the latest image from the registry else set to false for building the image and scanning it
1013
skip-image-build:
1114
required: false
@@ -56,14 +59,14 @@ jobs:
5659
if: ${{ !inputs.skip-image-build }}
5760
working-directory: ${{ inputs.path }}
5861
run: |
59-
make build REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} REGISTRY_USER=${{ secrets.ICR_USERNAME }} REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
62+
make build SERVICE=${{ inputs.service }} REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} REGISTRY_USER=${{ secrets.ICR_USERNAME }} REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
6063
6164
- name: Pull latest image Tag
6265
if: ${{ inputs.skip-image-build }}
6366
working-directory: ${{ inputs.path }}
6467
id: image-tag
6568
run: |
66-
TAG_VALUE=$(make image-tag)
69+
TAG_VALUE=$(make image-tag SERVICE=${{ inputs.service }})
6770
IMAGE_NAME=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }}/${{ inputs.image }}:${TAG_VALUE}
6871
podman pull --creds ${{ secrets.ICR_USERNAME }}:${{ secrets.ICR_APIKEY }} $IMAGE_NAME
6972
@@ -94,13 +97,13 @@ jobs:
9497
if: ${{ !inputs.skip-image-build }}
9598
working-directory: ${{ inputs.path }}
9699
run: |
97-
make build REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} REGISTRY_USER=${{ secrets.ICR_USERNAME }} REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
100+
make build SERVICE=${{ inputs.service }} REGISTRY=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }} REGISTRY_USER=${{ secrets.ICR_USERNAME }} REGISTRY_PASSWORD=${{ secrets.ICR_APIKEY }}
98101
99102
- name: Pull latest image tag
100103
if: ${{ inputs.skip-image-build && inputs.skip-code-license-scan }}
101104
working-directory: ${{ inputs.path }}
102105
run: |
103-
TAG_VALUE=$(make image-tag)
106+
TAG_VALUE=$(make image-tag SERVICE=${{ inputs.service }})
104107
IMAGE_NAME=${{ env.ICR_REGISTRY }}/${{ env.ICR_NAMESPACE }}/${{ inputs.image }}:${TAG_VALUE}
105108
podman pull --creds ${{ secrets.ICR_USERNAME }}:${{ secrets.ICR_APIKEY }} $IMAGE_NAME
106109

‎.github/workflows/similarity-service-image.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ jobs:
1212
name: Build and Publish Image
1313
uses: ./.github/workflows/build-and-publish-image.yml
1414
with:
15-
working-directory: 'services/similarity'
15+
service: 'similarity'
16+
working-directory: 'services'
1617
secrets: inherit
1718

1819
scan:
1920
uses: ./.github/workflows/scanner.yml
2021
with:
21-
path: 'services/similarity'
22+
path: 'services'
23+
service: 'similarity'
2224
image: 'similarity-service'
2325
secrets:
2426
ICR_USERNAME: ${{ secrets.ICR_USERNAME }}

‎.github/workflows/summarize-service-image.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ jobs:
1212
name: Build and Publish Image
1313
uses: ./.github/workflows/build-and-publish-image.yml
1414
with:
15-
working-directory: 'services/summarize'
15+
service: 'summarize'
16+
working-directory: 'services'
1617
secrets: inherit
1718

1819
scan:
1920
uses: ./.github/workflows/scanner.yml
2021
with:
21-
path: 'services/summarize'
22+
path: 'services'
23+
service: 'summarize'
2224
image: 'summarize-service'
2325
secrets:
2426
ICR_USERNAME: ${{ secrets.ICR_USERNAME }}

‎ai-services/assets/applications/rag-cpu/podman/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ backend:
88
# @description Host port for the OpenAI-compatible RAG service. Defaults to unexposed; assign a port to enable external access.
99
port: "0"
1010
# @hidden
11-
image: icr.io/ai-services-cicd/chatbot-service:v0.0.4
11+
image: icr.io/ai-services-cicd/chatbot-service:v0.0.5
1212
# @hidden
1313
log_level: "INFO"
1414

1515
digitize:
1616
# @description Host port for the DIGITIZE API. If unspecified, a random available port is assigned. Specify a port number to use a custom value.
1717
port: ""
1818
# @hidden
19-
image: icr.io/ai-services-cicd/digitize-service:v0.0.4
19+
image: icr.io/ai-services-cicd/digitize-service:v0.0.5
2020
# @hidden
2121
log_level: "INFO"
2222
# @description Database name for the DIGITIZE service. Default is "digitize_metadata".
@@ -83,15 +83,15 @@ summarize:
8383
# @description Host port for the Summarize API. If unspecified, a random available port is assigned. Specify a port number to use a custom value.
8484
port: ""
8585
# @hidden
86-
image: icr.io/ai-services-cicd/summarize-service:v0.0.3
86+
image: icr.io/ai-services-cicd/summarize-service:v0.0.4
8787
# @hidden
8888
log_level: "INFO"
8989

9090
similarity:
9191
# @description Host port for the Similarity Search API. If unspecified, a random available port is assigned. Specify a port number to use a custom value.
9292
port: ""
9393
# @hidden
94-
image: icr.io/ai-services-cicd/similarity-service:v0.0.3
94+
image: icr.io/ai-services-cicd/similarity-service:v0.0.4
9595
# @hidden
9696
log_level: "INFO"
9797

‎ai-services/assets/applications/rag-dev/openshift/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ ui:
44

55
backend:
66
# @hidden
7-
image: icr.io/ai-services-cicd/chatbot-service:v0.0.4
7+
image: icr.io/ai-services-cicd/chatbot-service:v0.0.5
88
# @hidden
99
log_level: "INFO"
1010

1111
summarize:
1212
# @hidden
13-
image: icr.io/ai-services-cicd/summarize-service:v0.0.3
13+
image: icr.io/ai-services-cicd/summarize-service:v0.0.4
1414
# @hidden
1515
log_level: "INFO"
1616

1717
similarity:
1818
# @hidden
19-
image: icr.io/ai-services-cicd/similarity-service:v0.0.3
19+
image: icr.io/ai-services-cicd/similarity-service:v0.0.4
2020
# @hidden
2121
log_level: "INFO"
2222

2323
digitize:
2424
# @hidden
25-
image: icr.io/ai-services-cicd/digitize-service:v0.0.4
25+
image: icr.io/ai-services-cicd/digitize-service:v0.0.5
2626
# @hidden
2727
log_level: "INFO"
2828
# @description Database name for the DIGITIZE service. Default is "digitize_metadata".

0 commit comments

Comments
 (0)