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.

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

Bump AWS AMI to Amazon Linux 2023 minimal #50

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 0 additions & 60 deletions .github/workflows/build_aws_minimal_manual.yml

This file was deleted.

7 changes: 4 additions & 3 deletions aws.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ source "amazon-ebs" "spacelift" {
source_ami_filter {
filters = {
virtualization-type = "hvm"
name = "amzn2-ami-kernel-5.10-hvm-2*-gp2"
name = "al2023-ami-minimal-*-kernel-6.1-${var.source_ami_architecture}"
root-device-type = "ebs"
architecture = var.source_ami_architecture
}
Expand Down Expand Up @@ -144,11 +144,12 @@ build {
provisioner "shell" {
scripts = [
"shared/scripts/data-directories.sh",
"aws/scripts/yum-update.sh",
"aws/scripts/dnf-update.sh",
"aws/scripts/system-deps.sh",
"aws/scripts/docker.sh",
"shared/scripts/gvisor.sh",
"aws/scripts/cloudwatch-agent.sh",
"aws/scripts/jq.sh",
"aws/scripts/ssm-agent.sh"
]
}

Expand Down
2 changes: 1 addition & 1 deletion aws/scripts/cloudwatch-agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
DOWNLOAD_URL=https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/${CURRENTARCH}/latest/amazon-cloudwatch-agent.rpm
RPM_PATH=/tmp/amazon-cloudwatch-agent.rpm

touch /var/log/spacelift/{info,error}.log
sudo touch /var/log/spacelift/{info,error}.log

curl $DOWNLOAD_URL --output $RPM_PATH
sudo rpm -U $RPM_PATH
Expand Down
File renamed without changes.
5 changes: 2 additions & 3 deletions aws/scripts/docker.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This script installs and starts Docker.

sudo amazon-linux-extras install docker
sudo systemctl enable docker
sudo service docker start
sudo dnf install -y docker
sudo systemctl enable --now docker
3 changes: 0 additions & 3 deletions aws/scripts/jq.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
3 changes: 0 additions & 3 deletions aws/scripts/yum-update.sh

This file was deleted.

152 changes: 0 additions & 152 deletions aws_minimal.pkr.hcl

This file was deleted.

134 changes: 0 additions & 134 deletions aws_minimal/configs/amazon-cloudwatch-agent.json

This file was deleted.

Loading
Loading