Skip to content
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

[WIP] DEV-22061 EB Windows Server 2022 로 gendo 이미지 굽기 시도 #1 #861

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] DEV-22061 EB Windows Server 2022 로 gendo 이미지 굽기 시도 #1 #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions _provisioning/configuration/root/.aws/config.sample
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions _provisioning/configuration/root/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/'
}
Expand All @@ -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"
2 changes: 1 addition & 1 deletion _provisioning/provisioning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions run_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}')

Expand Down
2 changes: 1 addition & 1 deletion run_create_eb_django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions run_create_imagebuilder_gendo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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']

Expand All @@ -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']

Expand All @@ -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']

Expand Down