Skip to content

Commit

Permalink
fix: try moving script commands into userData
Browse files Browse the repository at this point in the history
  • Loading branch information
jjmchew committed Aug 9, 2024
1 parent 6d30aed commit f3e8528
Showing 1 changed file with 30 additions and 17 deletions.
47 changes: 30 additions & 17 deletions cdk/ec23/lib/ec23-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
import * as docdb from 'aws-cdk-lib/aws-docdb';


const INSTANCE_NUM = 4;
const INSTANCE_NUM = 5;

export class Ec23Stack extends cdk.Stack {
constructor(scope: Construct, id: string, props?: cdk.StackProps) {
Expand Down Expand Up @@ -73,9 +73,22 @@ export class Ec23Stack extends cdk.Stack {
userData.addCommands(
'sudo apt update -y',
'sudo apt upgrade -y',
'git clone -b cdk1 https://github.com/2405-team3/db.git /home/ubuntu/db',
'bash /home/ubuntu/db/setup_scripts/setup_ec2.sh',
'/bin/bash -c "$(curl -fsSL https://github.com/2405-team3/db/blob/cdk1/setup_scripts/setup_ec2.sh)"'
// 'git clone -b cdk1 https://github.com/2405-team3/db.git /home/ubuntu/db',
// 'bash /home/ubuntu/db/setup_scripts/setup_ec2.sh',
// '/bin/bash -c "$(curl -fsSL https://github.com/2405-team3/db/blob/cdk1/setup_scripts/setup_ec2.sh)"'
'DEBIAN_FRONTEND=noninteractive sudo apt -y install nginx',
'curl https://pyenv.run | bash',
`echo 'export PYENV_ROOT="$HOME/.pyenv"' >>~/.profile`,
`echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >>~/.profile`,
`echo 'eval "$(pyenv init -)"' >>~/.profile`,
`source ~/.profile`,
'sudo apt -y install build-essential libssl-dev zlib1g-dev \
libbz2-dev libreadline-dev libsqlite3-dev curl \
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev',
'pyenv install -v 3.10.12',
'pyenv global 3.10.12',
'pip install pipenv',
`source ~/.profile`,
)

const keyPair = ec2.KeyPair.fromKeyPairAttributes(this, 'KeyPair', {
Expand All @@ -86,7 +99,7 @@ export class Ec23Stack extends cdk.Stack {
// Create an EC2 instance
const instance = new ec2.Instance(this, `CDKEC2-${INSTANCE_NUM}`, {
vpc,
instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MEDIUM),
machineImage: ubuntuAmi,
securityGroup: ec2SecurityGroup,
role: ec2Role,
Expand All @@ -105,19 +118,19 @@ export class Ec23Stack extends cdk.Stack {


// docdb cluster
const docdbCluster = new docdb.DatabaseCluster(this, `CDKDocDBCluster-${INSTANCE_NUM}`, {
masterUser: { username: 'docdbadmin' },
instanceType: ec2.InstanceType.of(ec2.InstanceClass.R5, ec2.InstanceSize.LARGE),
vpc,
securityGroup: docDbSecurityGroup,
vpcSubnets: {
subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS,
},
});
// const docdbCluster = new docdb.DatabaseCluster(this, `CDKDocDBCluster-${INSTANCE_NUM}`, {
// masterUser: { username: 'docdbadmin' },
// instanceType: ec2.InstanceType.of(ec2.InstanceClass.R5, ec2.InstanceSize.LARGE),
// vpc,
// securityGroup: docDbSecurityGroup,
// vpcSubnets: {
// subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS,
// },
// });

new cdk.CfnOutput(this, 'DocumentDBEndpoint', {
value: docdbCluster.clusterEndpoint.hostname,
});
// new cdk.CfnOutput(this, 'DocumentDBEndpoint', {
// value: docdbCluster.clusterEndpoint.hostname,
// });
}
}

Expand Down

0 comments on commit f3e8528

Please sign in to comment.