Skip to content

change Dockerfile source #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 1, 2024
Merged

change Dockerfile source #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12c637c
change aws to this.partition for support china region
supinyu Jul 1, 2024
44d8bd5
Merge branch 'main' into spy_dev
supinyu Jul 1, 2024
39c74c0
change Dockerfile source
supinyu Jul 1, 2024
894f929
remove init data
supinyu Jul 1, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM public.ecr.aws/docker/library/python:3.10-slim

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion application/Dockerfile-api
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim
FROM public.ecr.aws/docker/library/python:3.10-slim

WORKDIR /app

Expand Down
3 changes: 0 additions & 3 deletions application/initial_data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
Please download demo data to this folder. For example, run the following command:
```
wget https://github.com/fengxu1211/generative-bi-using-rag/raw/demo_data/application/initial_data/init_mysql_db.sql.zip
```
2 changes: 1 addition & 1 deletion source/resources/lib/aos/aos-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class AOSStack extends cdk.Stack {
effect: Effect.ALLOW,
principals: [new AnyPrincipal()],
actions: ["es:*"],
resources: [`arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/*`]
resources: [`arn:${this.partition}:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/*`]
})]
,
vpcSubnets: [
Expand Down
14 changes: 7 additions & 7 deletions source/resources/lib/ecs/ecs-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps & { cognitoUserP
"es:ESHttpDelete"
],
resources: [
`arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/*`
`arn:${this.partition}:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/*`
]
});
taskRole.addToPolicy(openSearchAccessPolicy);
Expand All @@ -82,7 +82,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps & { cognitoUserP
"dynamodb:Query"
],
resources: [
`arn:aws:dynamodb:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:table/*`,
`arn:${this.partition}:dynamodb:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:table/*`,
]
});
taskRole.addToPolicy(dynamoDBAccessPolicy);
Expand All @@ -93,8 +93,8 @@ constructor(scope: Construct, id: string, props: cdk.StackProps & { cognitoUserP
"secretsmanager:GetSecretValue"
],
resources: [
`arn:aws:secretsmanager:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:secret:opensearch-host-url*`,
`arn:aws:secretsmanager:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:secret:opensearch-master-user*`
`arn:${this.partition}:secretsmanager:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:secret:opensearch-host-url*`,
`arn:${this.partition}:secretsmanager:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:secret:opensearch-master-user*`
]
});
taskRole.addToPolicy(opensearchHostUrlSecretAccessPolicy);
Expand All @@ -107,7 +107,7 @@ constructor(scope: Construct, id: string, props: cdk.StackProps & { cognitoUserP
"bedrock:InvokeModelWithResponseStream"
],
resources: [
`arn:aws:bedrock:${cdk.Aws.REGION}::foundation-model/*`
`arn:${this.partition}:bedrock:${cdk.Aws.REGION}::foundation-model/*`
]
});
taskRole.addToPolicy(bedrockAccessPolicy);
Expand All @@ -121,8 +121,8 @@ constructor(scope: Construct, id: string, props: cdk.StackProps & { cognitoUserP
"cognito-idp:*"
],
resources: [
`arn:aws:cognito-idp:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:userpool/*`,
`arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/*`
`arn:${this.partition}:cognito-idp:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:userpool/*`,
`arn:${this.partition}:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/*`
]
});
taskRole.addToPolicy(cognitoAccessPolicy);
Expand Down