Skip to content

Commit f070f2b

Browse files
added aws ecr upload to rag ingestion workflow (#293)
* added aws ecr upload to rag ingestion workflow * support ecr upload in inference workflow * aws-actions/configure-aws-credentials@v1 to v4
1 parent fbd65bb commit f070f2b

5 files changed

Lines changed: 43 additions & 21 deletions

.github/workflows/build-rag-ingestion-develop.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ env:
99
GAR_LOCATION: asia-south1-docker.pkg.dev/aesy-330511/root-hub
1010
IMAGE_NAME: auraflo-rag-ingestion
1111

12-
# AWS_REGION: ap-south-1
13-
# ECR_REGISTRY: 025066241490.dkr.ecr.ap-south-1.amazonaws.com
14-
# ECR_REPOSITORY: rootflo/auraflo-rag-ingestion
12+
AWS_REGION: ap-south-1
13+
ECR_REGISTRY: 025066241490.dkr.ecr.ap-south-1.amazonaws.com
14+
ECR_REPOSITORY: rootflo/auraflo-rag-ingestion
1515

1616
ACR_REGISTRY_NAME: rootflo
1717
ACR_REGISTRY: rootflo.azurecr.io
@@ -69,21 +69,21 @@ jobs:
6969
docker push ${{ env.GAR_LOCATION }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
7070
7171
# Configure AWS credentials and push to ECR
72-
# - name: Configure AWS credentials
73-
# uses: aws-actions/configure-aws-credentials@v1
74-
# with:
75-
# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
76-
# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
77-
# aws-region: ${{ env.AWS_REGION }}
78-
79-
# - name: Login to Amazon ECR
80-
# id: login-ecr
81-
# uses: aws-actions/amazon-ecr-login@v1
82-
83-
# - name: Tag and push image to Amazon ECR
84-
# run: |
85-
# docker tag rootflo:${{ env.IMAGE_TAG }} ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
86-
# docker push ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
72+
- name: Configure AWS credentials
73+
uses: aws-actions/configure-aws-credentials@v4
74+
with:
75+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
76+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
77+
aws-region: ${{ env.AWS_REGION }}
78+
79+
- name: Login to Amazon ECR
80+
id: login-ecr
81+
uses: aws-actions/amazon-ecr-login@v1
82+
83+
- name: Tag and push image to Amazon ECR
84+
run: |
85+
docker tag rootflo:${{ env.IMAGE_TAG }} ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
86+
docker push ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
8787
8888
# Configure Azure credentials and push to ACR
8989
- name: Login to Azure

.github/workflows/build-wavefront-floconsole-develop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
7171
# Configure AWS credentials and push to ECR
7272
- name: Configure AWS credentials
73-
uses: aws-actions/configure-aws-credentials@v1
73+
uses: aws-actions/configure-aws-credentials@v4
7474
with:
7575
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7676
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/build-wavefront-floware-develop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
7171
# Configure AWS credentials and push to ECR
7272
- name: Configure AWS credentials
73-
uses: aws-actions/configure-aws-credentials@v1
73+
uses: aws-actions/configure-aws-credentials@v4
7474
with:
7575
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7676
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/build-wavefront-inference_app-develop.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ env:
99
GAR_LOCATION: asia-south1-docker.pkg.dev/aesy-330511/root-hub
1010
IMAGE_NAME: wavefront-inference_app
1111

12+
AWS_REGION: ap-south-1
13+
ECR_REGISTRY: 025066241490.dkr.ecr.ap-south-1.amazonaws.com
14+
ECR_REPOSITORY: rootflo/wavefront-inference_app
15+
1216
ACR_REGISTRY_NAME: rootflo
1317
ACR_REGISTRY: rootflo.azurecr.io
1418
ACR_REPOSITORY: wavefront-inference_app
@@ -64,6 +68,23 @@ jobs:
6468
docker tag rootflo:${{ env.IMAGE_TAG }} ${{ env.GAR_LOCATION }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
6569
docker push ${{ env.GAR_LOCATION }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
6670
71+
# Configure AWS credentials and push to ECR
72+
- name: Configure AWS credentials
73+
uses: aws-actions/configure-aws-credentials@v4
74+
with:
75+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
76+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
77+
aws-region: ${{ env.AWS_REGION }}
78+
79+
- name: Login to Amazon ECR
80+
id: login-ecr
81+
uses: aws-actions/amazon-ecr-login@v1
82+
83+
- name: Tag and push image to Amazon ECR
84+
run: |
85+
docker tag rootflo:${{ env.IMAGE_TAG }} ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
86+
docker push ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
87+
6788
# Configure Azure credentials and push to ACR
6889
- name: Login to Azure
6990
uses: azure/login@v2
@@ -82,4 +103,5 @@ jobs:
82103
run: |
83104
docker rmi rootflo:${{ env.IMAGE_TAG }} || true
84105
docker rmi ${{ env.GAR_LOCATION }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} || true
106+
docker rmi ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} || true
85107
docker rmi ${{ env.ACR_REGISTRY }}/${{ env.ACR_REPOSITORY }}:${{ env.IMAGE_TAG }} || true

.github/workflows/build-wavefront-web-develop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
7171
# Configure AWS credentials and push to ECR
7272
- name: Configure AWS credentials
73-
uses: aws-actions/configure-aws-credentials@v1
73+
uses: aws-actions/configure-aws-credentials@v4
7474
with:
7575
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7676
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

0 commit comments

Comments
 (0)