Skip to content

Commit

Permalink
fix: small bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
AidanAbd committed Jun 19, 2023
1 parent 0077565 commit e691aa1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
packer validate .

@build:
packer build -debug sysbox-eks.pkr.hcl
packer build sysbox-eks.pkr.hcl
18 changes: 15 additions & 3 deletions sysbox-eks.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ packer {
}

source "amazon-ebs" "ubuntu-eks" {
ami_name = "latch-bio/sysbox-eks_${var.sysbox_version}_patch-1/k8s_${var.k8s_version}/images/hvm-ssd/ubuntu-${var.ubuntu_version}-amd64-server"
ami_name = "latch-bio/sysbox-eks_${var.sysbox_version}_patch-1/k8s_${var.k8s_version}/images/hvm-ssd/ubuntu-${var.ubuntu_version}-amd64-server-rev-0"
ami_description = "Latch Bio, Sysbox EKS Node (k8s_${var.k8s_version}), on Ubuntu ${var.ubuntu_version}, amd64 image"

tags = {
Expand Down Expand Up @@ -81,7 +81,7 @@ build {
"set -o pipefail -o errexit",

"echo Updating apt",
"sudo apt-get update",
"sudo apt-get update -y",
]
}

Expand Down Expand Up @@ -119,7 +119,8 @@ build {
"echo '>>> Shiftfs'",

"echo Installing dependencies",
"sudo apt-get install --yes --no-install-recommends make dkms",
"sudo apt-get update",
"sudo apt-get install --yes --no-install-recommends make dkms git",

"echo Detecting kernel version to determine the correct branch",
"export kernel_version=\"$(uname -r | sed --regexp-extended 's/([0-9]+\\.[0-9]+).*/\\1/g')\"",
Expand Down Expand Up @@ -301,4 +302,15 @@ build {
"sudo rm -r /etc/cni/net.d/",
]
}

# https://github.com/containers/podman/issues/11745
provisioner "shell" {
inline_shebang = "/usr/bin/env bash"
inline = [
"set -o pipefail -o errexit",

"echo '>>> Disabling `[machine]` key in /usr/share/containers/containers.conf'",
"sudo perl -i -pe 's/^\\[machine\\]/#$&/' /usr/share/containers/containers.conf",
]
}
}

0 comments on commit e691aa1

Please sign in to comment.