From 42feccf4c2939bdf6afac025b05ed7232b41b070 Mon Sep 17 00:00:00 2001 From: Jesang Yoon Date: Tue, 8 Oct 2024 18:58:46 +0900 Subject: [PATCH] errara --- _provisioning/configuration/root/.aws/config.sample | 11 ----------- _provisioning/configuration/root/.bashrc | 4 ++-- _provisioning/provisioning.py | 2 +- run_common.py | 4 ++-- run_create_eb_django.py | 2 +- run_create_imagebuilder_gendo.py | 8 ++++---- 6 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 _provisioning/configuration/root/.aws/config.sample diff --git a/_provisioning/configuration/root/.aws/config.sample b/_provisioning/configuration/root/.aws/config.sample deleted file mode 100644 index 97f9eb3a..00000000 --- a/_provisioning/configuration/root/.aws/config.sample +++ /dev/null @@ -1,11 +0,0 @@ -[profile hbsmith-dv] -sso_session = hbsmith-dv -sso_account_id = YOUR_DV_ACCOUNT_ID -sso_role_name = AdministratorAccess -region = ap-northeast-2 -output = json - -[sso-session hbsmith-dv] -sso_start_url = https://d-9b67225886.awsapps.com/start#/ -sso_region = ap-northeast-2 -sso_registration_scopes = sso:account:access diff --git a/_provisioning/configuration/root/.bashrc b/_provisioning/configuration/root/.bashrc index 127e74d8..d9dc5d11 100644 --- a/_provisioning/configuration/root/.bashrc +++ b/_provisioning/configuration/root/.bashrc @@ -12,8 +12,6 @@ then fi export PATH -export AWS_PROFILE="hbsmith-dv" - parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' } @@ -28,3 +26,5 @@ alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' alias awslogin='aws sso login' + +export NODE_OPTIONS="--max-old-space-size=2048" diff --git a/_provisioning/provisioning.py b/_provisioning/provisioning.py index 9a20cc29..06ba6bf4 100755 --- a/_provisioning/provisioning.py +++ b/_provisioning/provisioning.py @@ -104,7 +104,7 @@ def _preprocess(): _print_line_number() node_version = 'v14.19.1' - _run(['wget', 'https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh'], cwd='/root') + _run(['wget', 'https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh'], cwd='/root') _run(['chmod', '+x', 'install.sh'], cwd='/root') _run(['./install.sh'], cwd='/root') diff --git a/run_common.py b/run_common.py index b168cc91..bef7d594 100755 --- a/run_common.py +++ b/run_common.py @@ -515,10 +515,10 @@ def get_eb_gendo_windows_platform(self, target_service): in_use_eb_windows_version = '2.15.5' if target_service == 'elastic_beanstalk': - return f'64bit Windows Server 2016 v{in_use_eb_windows_version} running IIS 10.0' + return f'64bit Windows Server 2022 v{in_use_eb_windows_version} running IIS 10.0' if target_service == 'imagebuilder': - return f'IIS 10.0 running on 64bit Windows Server 2016/{in_use_eb_windows_version}' + return f'IIS 10.0 running on 64bit Windows Server 2022/{in_use_eb_windows_version}' raise Exception(f'unsupported platform: {target_service}') diff --git a/run_create_eb_django.py b/run_create_eb_django.py index 82f406b5..177ac5e0 100755 --- a/run_create_eb_django.py +++ b/run_create_eb_django.py @@ -460,7 +460,7 @@ def run_create_eb_django(name, settings, options): cmd += ['--cname-prefix', cname] cmd += ['--environment-name', eb_environment_name] cmd += ['--option-settings', option_settings] - cmd += ['--solution-stack-name', '64bit Amazon Linux 2 v3.7.3 running Python 3.8'] + cmd += ['--solution-stack-name', '64bit Amazon Linux 2 v3.7.4 running Python 3.8'] cmd += ['--tags', tag0, tag1] cmd += ['--version-label', eb_environment_name] aws_cli.run(cmd, cwd=template_path) diff --git a/run_create_imagebuilder_gendo.py b/run_create_imagebuilder_gendo.py index d95376cb..dae5e214 100755 --- a/run_create_imagebuilder_gendo.py +++ b/run_create_imagebuilder_gendo.py @@ -66,7 +66,7 @@ def run_create_image_builder(options): cmd = ['ec2', 'describe-images'] cmd += ['--owner', 'amazon'] cmd += ['--filters', - 'Name=name,Values=aws-elasticbeanstalk-amzn-??????????.x86_64-WindowsServer2016-V2-hvm-*', + 'Name=name,Values=aws-elasticbeanstalk-amzn-??????????.x86_64-WindowsServer2022-V2-hvm-*', 'Name=state,Values=available'] cmd += ['--query', 'reverse(sort_by(Images, &CreationDate))[:1].ImageId'] cmd += ['--output', 'text'] @@ -134,7 +134,7 @@ def run_create_image_builder(options): cmd += ['--name', gendo_component_name] cmd += ['--semantic-version', semantic_version] cmd += ['--platform', 'Windows'] - cmd += ['--supported-os-versions', 'Microsoft Windows Server 2016'] + cmd += ['--supported-os-versions', 'Microsoft Windows Server 2022'] cmd += ['--tags', f'{git_hash_johanna_tag},{git_hash_gendo_tag},{target_eb_platform_version_tag}'] cmd += ['--data', 'file://template/gendo/gendo/_provisioning/gendo_image_provisioning_part1.yml'] @@ -146,7 +146,7 @@ def run_create_image_builder(options): cmd += ['--name', gendo_component_name] cmd += ['--semantic-version', semantic_version] cmd += ['--platform', 'Windows'] - cmd += ['--supported-os-versions', 'Microsoft Windows Server 2016'] + cmd += ['--supported-os-versions', 'Microsoft Windows Server 2022'] cmd += ['--tags', f'{git_hash_johanna_tag},{git_hash_gendo_tag},{target_eb_platform_version_tag}'] cmd += ['--data', 'file://template/gendo/gendo/_provisioning/gendo_image_provisioning_part2.yml'] @@ -158,7 +158,7 @@ def run_create_image_builder(options): cmd += ['--name', gendo_component_name] cmd += ['--semantic-version', semantic_version] cmd += ['--platform', 'Windows'] - cmd += ['--supported-os-versions', 'Microsoft Windows Server 2016'] + cmd += ['--supported-os-versions', 'Microsoft Windows Server 2022'] cmd += ['--tags', f'{git_hash_johanna_tag},{git_hash_gendo_tag},{target_eb_platform_version_tag}'] cmd += ['--data', 'file://template/gendo/gendo/_provisioning/gendo_image_provisioning_test_sample.yml']