Skip to content

AMI: Clean up messy apt handling #2351

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

Draft
mmlb wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

AMI: Clean up messy apt handling #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98fa5e9
qemu: Report disk usage
mmlb Aug 25, 2026
77695ea
images: report all packages installed at end
mmlb Aug 25, 2026
399bd3a
packer: Simplify apt mirror fallback
mmlb Aug 14, 2026
e4725ba
packer: Minimize and improve apt-get calls
mmlb Jul 30, 2026
4524856
packer: Refactor apt usage
mmlb Jul 29, 2026
5415d14
packer: Remove dead code from cleanup scripts
mmlb Jul 30, 2026
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
5 changes: 0 additions & 5 deletions amazon-amd64-nix.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,6 @@ source "amazon-ebssurrogate" "source" {
build {
sources = ["source.amazon-ebssurrogate.source"]

provisioner "file" {
source = "ebssurrogate/files/sources.cfg"
destination = "/tmp/sources.list"
}

provisioner "file" {
source = "ebssurrogate/files/ebsnvme-id"
destination = "/tmp/ebsnvme-id"
Expand Down
5 changes: 0 additions & 5 deletions amazon-arm64-nix.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,6 @@ source "amazon-ebssurrogate" "source" {
build {
sources = ["source.amazon-ebssurrogate.source"]

provisioner "file" {
source = "ebssurrogate/files/sources-arm64.cfg"
destination = "/tmp/sources.list"
}

provisioner "file" {
source = "ebssurrogate/files/ebsnvme-id"
destination = "/tmp/ebsnvme-id"
Expand Down
11 changes: 0 additions & 11 deletions ansible/playbook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,6 @@
when: not stage2
import_tasks: tasks/setup-fail2ban.yml

# Install EC2 instance connect
# Only for AWS images
- name: install EC2 instance connect
when: not qemu
become: yes
apt:
pkg:
- ec2-instance-connect
tags:
- aws-only

# Install this at the end to prevent it from kicking in during the apt process, causing conflicts
- name: Install security tools
become: yes
Expand Down
10 changes: 0 additions & 10 deletions ebssurrogate/files/sources-arm64.cfg
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ebssurrogate/files/sources.cfg
View file
Open in desktop

This file was deleted.

Loading
Loading