aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip: alpine 3.16

Browse Source
This commit is contained in:
Yann Autissier
2022-10-12 00:50:02 +00:00
parent b665296f2c
commit 54bf6bbbe0
19 changed files with 246 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packer/alpine/alpine.json
-105
View File
@@ -1,105 +0,0 @@
{
"builders": [
{
"accelerator": "{{user `accelerator`}}",
"boot_command": [
"{{user `username`}}<enter>",
"passwd<enter>{{user `password`}}<enter>{{user `password`}}<enter>",
"ifconfig eth0 up \u0026\u0026 udhcpc -i eth0<enter>",
"apk add --repository http://dl-cdn.alpinelinux.org/alpine/v{{user `alpine_version`}}/main dropbear dropbear-openrc openssh-sftp-server<enter>",
"rc-update add dropbear<enter>",
"echo -e 'auto eth0\\niface eth0 inet dhcp' > /etc/network/interfaces<enter>",
"rc-service dropbear start<enter>",
"<wait>"
],
"boot_wait": "{{user `boot_wait`}}",
"disk_interface": "virtio",
"disk_size": "{{user `iso_size`}}",
"format": "raw",
"headless": true,
"host_port_max": "{{user `ssh_port_max`}}",
"host_port_min": "{{user `ssh_port_min`}}",
"iso_checksum": "file:http://dl-cdn.alpinelinux.org/alpine/v{{user `alpine_version`}}/releases/{{user `alpine_arch`}}/alpine-virt-{{user `alpine_release`}}-{{user `alpine_arch`}}.iso.sha256",
"iso_url": "http://dl-cdn.alpinelinux.org/alpine/v{{user `alpine_version`}}/releases/{{user `alpine_arch`}}/alpine-virt-{{user `alpine_release`}}-{{user `alpine_arch`}}.iso",
"net_device": "virtio-net",
"output_directory": "{{user `output`}}",
"qemuargs": [
[
"-device",
"virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7"
],
[
"-object",
"rng-random,filename=/dev/urandom,id=rng0"
]
],
"shutdown_command": "/sbin/poweroff",
"ssh_file_transfer_method": "sftp",
"ssh_password": "{{user `password`}}",
"ssh_port": 22,
"ssh_timeout": "{{user `ssh_wait_timeout`}}",
"ssh_username": "{{user `username`}}",
"type": "qemu",
"vm_name": "{{user `iso_name`}}.iso",
"vnc_bind_address": "{{user `vnc_bind_address`}}",
"vnc_port_max": "{{user `vnc_port_max`}}",
"vnc_port_min": "{{user `vnc_port_min`}}"
}
],
"provisioners": [
{
"environment_vars": [
"ALPINE_VERSION={{user `alpine_version`}}",
"HOSTNAME={{user `hostname`}}"
],
"script": "packer/alpine/setup.sh",
"type": "shell"
},
{
"expect_disconnect": true,
"inline": [
"/usr/bin/eject -s",
"/sbin/reboot"
],
"type": "shell"
},
{
"extra_arguments": [
"--extra-vars",
"{{user `ansible_extra_vars`}}",
"{{user `ansible_verbose`}}"
],
"inventory_directory": "ansible/inventories",
"pause_before": "16s",
"playbook_file": "ansible/playbook.yml",
"sftp_command": "/usr/lib/ssh/sftp-server -e",
"type": "ansible",
"user": "{{user `ansible_user`}}"
}
],
"variables": {
"accelerator": "kvm",
"alpine_arch": "x86_64",
"alpine_release": "3.12.0",
"alpine_version": "3.12",
"ansible_extra_vars": "target=default",
"ansible_user": "root",
"ansible_verbose": "-v",
"boot_wait": "8s",
"hostname": "alpine",
"iso_name": "alpine-3.12.0-x86_64",
"iso_size": "1024",
"output": "build/iso",
"password": "alpine",
"qemuargs": "",
"ssh_port_max": "2222",
"ssh_port_min": "2222",
"ssh_wait_timeout": "32s",
"template": "alpine",
"username": "root",
"vnc_bind_address": "127.0.0.1",
"vnc_port_max": "5900",
"vnc_port_min": "5900"
}
}
packer/alpine/alpine.pkr.hcl
+176
View File
@@ -0,0 +1,176 @@
variable "accelerator" {
type = string
default = "kvm"
}
variable "alpine_arch" {
type = string
default = "x86_64"
}
variable "alpine_release" {
type = string
default = "3.16.0"
}
variable "alpine_version" {
type = string
default = "3.16"
}
variable "ansible_extra_vars" {
type = string
default = "target=default"
}
variable "ansible_user" {
type = string
default = "root"
}
variable "ansible_verbose" {
type = string
default = "-v"
}
variable "boot_wait" {
type = string
default = "8s"
}
variable "hostname" {
type = string
default = "alpine"
}
variable "iso_name" {
type = string
default = "alpine-3.16.0-x86_64"
}
variable "iso_size" {
type = string
default = "1024"
}
variable "nameserver" {
type = string
default = "1.1.1.1"
}
variable "output" {
type = string
default = "build/iso"
}
variable "password" {
type = string
default = "alpine"
}
variable "pause_before" {
type = string
default = "24s"
}
variable "qemuargs" {
type = string
default = ""
}
variable "ssh_port_max" {
type = string
default = "2222"
}
variable "ssh_port_min" {
type = string
default = "2222"
}
variable "ssh_timeout" {
type = string
default = "42s"
}
variable "template" {
type = string
default = "alpine"
}
variable "username" {
type = string
default = "root"
}
variable "vnc_bind_address" {
type = string
default = "127.0.0.1"
}
variable "vnc_port_max" {
type = string
default = "5900"
}
variable "vnc_port_min" {
type = string
default = "5900"
}
source "qemu" "autogenerated_1" {
accelerator = "${var.accelerator}"
boot_command = ["${var.username}<enter>", "passwd<enter>${var.password}<enter>${var.password}<enter>", "ifconfig eth0 up && udhcpc -i eth0<enter>", "apk add --repository http://dl-cdn.alpinelinux.org/alpine/v${var.alpine_version}/main dropbear dropbear-openrc openssh-sftp-server<enter>", "rc-update add dropbear<enter>", "echo -e 'auto eth0\\niface eth0 inet dhcp' > /etc/network/interfaces<enter>", "mkdir -p /etc/dropbear<enter>", "dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key<enter>", "rc-service dropbear start<enter>", "<wait>"]
boot_wait = "${var.boot_wait}"
disk_interface = "virtio"
disk_size = "${var.iso_size}"
format = "raw"
headless = true
host_port_max = "${var.ssh_port_max}"
host_port_min = "${var.ssh_port_min}"
iso_checksum = "file:http://dl-cdn.alpinelinux.org/alpine/v${var.alpine_version}/releases/${var.alpine_arch}/alpine-virt-${var.alpine_release}-${var.alpine_arch}.iso.sha256"
iso_url = "http://dl-cdn.alpinelinux.org/alpine/v${var.alpine_version}/releases/${var.alpine_arch}/alpine-virt-${var.alpine_release}-${var.alpine_arch}.iso"
net_device = "virtio-net"
output_directory = "${var.output}"
qemuargs = [["-device", "virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7"], ["-object", "rng-random,filename=/dev/urandom,id=rng0"]]
// qemuargs = ["${var.qemuargs}"]
shutdown_command = "/sbin/poweroff"
ssh_file_transfer_method = "sftp"
ssh_password = "${var.password}"
ssh_port = 22
ssh_timeout = "${var.ssh_timeout}"
ssh_username = "${var.username}"
vm_name = "${var.iso_name}.iso"
vnc_bind_address = "${var.vnc_bind_address}"
vnc_port_max = "${var.vnc_port_max}"
vnc_port_min = "${var.vnc_port_min}"
}
build {
sources = ["source.qemu.autogenerated_1"]
provisioner "shell" {
environment_vars = ["ALPINE_VERSION=${var.alpine_version}", "HOSTNAME=${var.hostname}", "NAMESERVER=${var.nameserver}"]
script = "packer/alpine/setup.sh"
}
provisioner "shell" {
expect_disconnect = true
inline = ["/usr/bin/eject -s", "/sbin/reboot"]
}
provisioner "ansible" {
// https://github.com/hashicorp/packer-plugin-ansible/issues/69
ansible_ssh_extra_args = ["-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"]
extra_arguments = ["--extra-vars", "${var.ansible_extra_vars}", "${var.ansible_verbose}"]
inventory_directory = "ansible/inventories"
pause_before = "${var.pause_before}"
playbook_file = "ansible/playbook.yml"
sftp_command = "/usr/lib/ssh/sftp-server -e"
use_proxy = "true"
use_sftp = "true"
user = "${var.ansible_user}"
}
}
packer/alpine/setup.sh
+3 -6
View File
@@ -3,11 +3,11 @@
export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
ALPINE_VERSION="${ALPINE_VERSION:-3.10}"
ALPINE_VERSION="${ALPINE_VERSION:-3.16}"
APKREPOSOPTS="http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community"
BOOT_SIZE="32"
DISKOPTS="-s 0 -m sys /dev/vda"
DNSOPTS="-n 8.8.8.8"
DNSOPTS="-n ${NAMESERVER:-1.1.1.1}"
HOSTNAME="${HOSTNAME:-alpine}"
HOSTNAMEOPTS="-n ${HOSTNAME}"
INTERFACESOPTS="auto lo
@@ -15,9 +15,6 @@ iface lo inet loopback
auto eth0
iface eth0 inet dhcp
auto eth1
iface eth1 inet dhcp
"
KEYMAPOPTS="fr fr"
NTPOPTS="-c openntpd"
@@ -35,7 +32,7 @@ http://dl-8.alpinelinux.org/alpine/"
/sbin/setup-hostname ${HOSTNAMEOPTS}
echo "${INTERFACESOPTS}" | /sbin/setup-interfaces -i
# /etc/init.d/networking --quiet start >/dev/null
# /sbin/setup-dns ${DNSOPTS}
/sbin/setup-dns ${DNSOPTS}
/sbin/setup-timezone ${TIMEZONEOPTS}
/sbin/setup-proxy -q ${PROXYOPTS}
/sbin/setup-apkrepos ${APKREPOSOPTS}
packer/def.packer.alpine.mk
+1 -1
View File
@@ -1,5 +1,5 @@
PACKER_ALPINE_ARCH ?= x86_64
PACKER_ALPINE_RELEASE ?= 3.12.0
PACKER_ALPINE_RELEASE ?= 3.16.2
PACKER_BUILD_VARS += alpine_arch alpine_release alpine_version
alpine_arch ?= $(PACKER_ALPINE_ARCH)
alpine_release ?= $(PACKER_ALPINE_RELEASE)
packer/def.packer.mk
+17 -12
View File
@@ -3,9 +3,9 @@ DOCKER_RUN_OPTIONS_PACKER ?= -it -p $(PACKER_SSH_PORT):$(PACKER_SSH_PORT)
ENV_VARS += PACKER_CACHE_DIR PACKER_KEY_INTERVAL PACKER_LOG
KVM_GID ?= $(call gid,kvm)
PACKER_ARCH ?= $(PACKER_ALPINE_ARCH)
PACKER_BOOT_WAIT ?= 11s
PACKER_BOOT_WAIT ?= 24s
PACKER_BUILD_ARGS ?= -on-error=cleanup $(foreach var,$(PACKER_BUILD_VARS),$(if $($(var)),-var $(var)='$($(var))'))
PACKER_BUILD_VARS += accelerator boot_wait hostname iso_name iso_size output password qemuargs ssh_wait_timeout template username
PACKER_BUILD_VARS += accelerator boot_wait hostname iso_name iso_size nameserver output password pause_before qemuargs ssh_timeout template username
PACKER_BUILD_VARS += ansible_extra_vars ansible_user ansible_verbose
PACKER_CACHE_DIR ?= build/cache
PACKER_HOSTNAME ?= $(PACKER_TEMPLATE)
@@ -14,19 +14,21 @@ PACKER_ISO_FILES ?= $(wildcard build/iso/*/*/*.iso)
PACKER_ISO_FILE = $(PACKER_OUTPUT)/$(PACKER_ISO_NAME).iso
PACKER_ISO_INFO = $(PACKER_OUTPUT)/$(PACKER_ISO_NAME).nfo
PACKER_ISO_NAME = $(PACKER_TEMPLATE)-$(PACKER_RELEASE)-$(PACKER_ARCH)
PACKER_ISO_SIZE ?= 1024
PACKER_KEY_INTERVAL ?= 10ms
PACKER_ISO_SIZE ?= 2048
PACKER_KEY_INTERVAL ?= 11ms
PACKER_LOG ?= 1
PACKER_NAMESERVER ?= 1.1.1.1
PACKER_OUTPUT ?= build/iso/$(ENV)/$(PACKER_TEMPLATE)/$(PACKER_RELEASE)-$(PACKER_ARCH)
PACKER_PASSWORD ?= $(PACKER_TEMPLATE)
PACKER_PAUSE_BEFORE ?= 24s
PACKER_QEMU_ACCELERATOR ?= kvm
PACKER_QEMU_ARCH ?= $(PACKER_ARCH)
PACKER_QEMU_ARGS ?= -machine type=pc,accel=$(PACKER_QEMU_ACCELERATOR) -device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 -object rng-random,filename=/dev/urandom,id=rng0
PACKER_RELEASE ?= $(PACKER_ALPINE_RELEASE)
PACKER_SSH_ADDRESS ?= $(if $(ssh_bind_address),$(ssh_bind_address),0.0.0.0)
PACKER_SSH_PORT ?= $(if $(ssh_port_max),$(ssh_port_max),2222)
PACKER_SSH_WAIT_TIMEOUT ?= 42s
PACKER_TEMPLATES ?= $(wildcard packer/*/*.json)
PACKER_SSH_TIMEOUT ?= 42s
PACKER_TEMPLATES ?= $(wildcard packer/*/*.json packer/*/*.pkr.hcl)
PACKER_TEMPLATE ?= alpine
PACKER_USERNAME ?= root
PACKER_VNC_PORT ?= $(if $(vnc_port_max),$(vnc_port_max),5900)
@@ -51,8 +53,9 @@ iso_name ?= $(PACKER_ISO_NAME)
iso_size ?= $(PACKER_ISO_SIZE)
output ?= $(PACKER_OUTPUT)
password ?= $(PACKER_PASSWORD)
pause_before ?= $(PACKER_PAUSE_BEFORE)
qemuargs ?= $(call arrays_of_dquoted_args, $(PACKER_QEMU_ARGS))
ssh_wait_timeout ?= $(PACKER_SSH_WAIT_TIMEOUT)
ssh_timeout ?= $(PACKER_SSH_TIMEOUT)
template ?= $(PACKER_TEMPLATE)
username ?= $(PACKER_USERNAME)
@@ -62,16 +65,17 @@ password := $(or $(shell pwgen -csy -r\' 64 1 2>/dev/null
endif
endif
ifeq ($(OPERATING_SYSTEM),Darwin)
ifeq ($(SYSTEM),Darwin)
ifneq ($(DOCKER), true)
PACKER_QEMU_ACCELERATOR := hvf
PACKER_QEMU_ARGS += -cpu host
else
PACKER_QEMU_ACCELERATOR := tcg
PACKER_QEMU_ARGS += -cpu max,vendor=GenuineIntel,vmware-cpuid-freq=on,+invtsc,+aes,+vmx
endif
else ifeq ($(OPERATING_SYSTEM),Linux)
else ifeq ($(SYSTEM),Linux)
DOCKER_RUN_OPTIONS_PACKER += $(if $(KVM_GID),--group-add $(KVM_GID)) --device /dev/kvm
else ifeq ($(OPERATING_SYSTEM),Windows_NT)
else ifeq ($(SYSTEM),Windows_NT)
PACKER_QEMU_ACCELERATOR := hax
endif
@@ -90,12 +94,13 @@ endef
# function packer-build: Call packer build with arg 1, Add build infos to file PACKER_ISO_INFO
define packer-build
$(eval PACKER_TEMPLATE := $(notdir $(basename $(1))))
$(eval PACKER_TEMPLATE := $(notdir $(basename $(basename $(1)))))
echo Building $(PACKER_ISO_FILE)
$(call packer,build $(PACKER_BUILD_ARGS) $(1))
echo 'aws_id: $(ANSIBLE_AWS_ACCESS_KEY_ID)' > $(PACKER_ISO_INFO)
echo 'aws_key: $(ANSIBLE_AWS_SECRET_ACCESS_KEY)' >> $(PACKER_ISO_INFO)
echo 'aws_region: $(ANSIBLE_AWS_DEFAULT_REGION)' >> $(PACKER_ISO_INFO)
echo 'dns: $(nameserver)' >> $(PACKER_ISO_INFO)
echo 'docker_image_tag: $(ANSIBLE_DOCKER_IMAGE_TAG)' >> $(PACKER_ISO_INFO)
echo 'docker_registry: $(ANSIBLE_DOCKER_REGISTRY)' >> $(PACKER_ISO_INFO)
echo 'env: $(ENV)' >> $(PACKER_ISO_INFO)
@@ -114,4 +119,4 @@ define packer-build
echo 'user: $(username)' >> $(PACKER_ISO_INFO)
endef
arrays_of_dquoted_args = $(subst $(dquote) $(dquote),$(dquote)$(comma) $(dquote),$(subst $(dquote) $(dquote)-,$(dquote) ]$(comma) [ $(dquote)-,$(patsubst %,$(dquote)%$(dquote),$1)))
arrays_of_dquoted_args = [ $(subst $(dquote) $(dquote),$(dquote)$(comma) $(dquote),$(subst $(dquote) $(dquote)-,$(dquote) ]$(comma) [ $(dquote)-,$(patsubst %,$(dquote)%$(dquote),$1))) ]
packer/packer.mk
+4 -4
View File
@@ -18,7 +18,7 @@ packer-build-templates: $(PACKER_TEMPLATES) ## Build all packer templates
# target $(PACKER_TEMPLATES): Call packer-build $@
.PHONY: $(PACKER_TEMPLATES)
ifeq ($(OPERATING_SYSTEM),Darwin)
ifeq ($(SYSTEM),Darwin)
$(PACKER_TEMPLATES): DOCKER ?= false
endif
$(PACKER_TEMPLATES):
@@ -27,8 +27,8 @@ $(PACKER_TEMPLATES):
# target packer-build-%: Call packer-build with file packer/*/%.json
.PHONY: packer-build-%
packer-build-%: docker-build-packer
$(if $(wildcard packer/*/$*.json),\
$(call packer-build,$(wildcard packer/*/$*.json)))
$(if $(wildcard packer/*/$*.json packer/*/$*.pkr.hcl),\
$(call packer-build,$(firstword $(wildcard packer/*/$*.json packer/*/$*.pkr.hcl))))
# target packer-qemu: Fire packer-quemu-% for PACKER_ISO_NAME
.PHONY: packer-qemu
@@ -36,7 +36,7 @@ packer-qemu: packer-qemu-$(PACKER_ISO_NAME) ## Launch iso image in qemu
# target packer-qemu-%: Call packer-qemu PACKER_OUTPUT/%.iso
.PHONY: packer-qemu-%
ifeq ($(OPERATING_SYSTEM),Darwin)
ifeq ($(SYSTEM),Darwin)
packer-qemu-%: DOCKER ?= false
endif
packer-qemu-%: docker-build-packer ## Run iso image in qemu