Refactor rocky8 (#201)

Relates to #197 

Remove reliance on make when building the Rocky 8 image.

centos7/centos7.pkr.hcl

@@ -91,10 +91,11 @@ build {
 
   post-processor "shell-local" {
     inline = [
-      "SOURCE=centos7",
+      "SOURCE=${source.name}",
       "OUTPUT=${var.filename}",
       "source ../scripts/fuse-nbd",
-      "source ../scripts/fuse-tar-root"
+      "source ../scripts/fuse-tar-root",
+      "rm -rf output-${source.name}",
     ]
     inline_shebang = "/bin/bash -e"
   }

rocky8/Makefile

@@ -5,21 +5,16 @@ include ../scripts/check.mk
 PACKER ?= packer
 PACKER_LOG ?= 0
 
-export PACKER_LOG KS_PROXY
+export PACKER_LOG
 
 .PHONY: all clean
 
 all: rocky8.tar.gz
 
 $(eval $(call check_packages_deps))
 
-rocky8.tar.gz: check-deps clean http/rocky.ks
+rocky8.tar.gz: check-deps clean
 	${PACKER} init rocky8.pkr.hcl && ${PACKER} build rocky8.pkr.hcl
 
-http/rocky.ks: http/rocky.ks.in
-	envsubst '$${KS_PROXY}' < $< | tee $@
-
 clean:
-	${RM} -rf output-rocky8 rocky8.tar.gz http/rocky.ks
-
-.INTERMEDIATE: http/rocky.ks
+	${RM} -rf output-rocky8 rocky8.tar.gz

rocky8/README.md

@@ -26,7 +26,16 @@ The Packer template downloads the Rocky ISO image from the Internet. You can tel
 To use a proxy during the installation define the `KS_PROXY` variable in the environment, as bellow:
 
 ```shell
-export KS_PROXY="--proxy=\"${HTTP_PROXY}\""
+export KS_PROXY="\"${HTTP_PROXY}\""
+```
+
+# Building the image using a kickstart mirror
+
+To tell Packer to use a specific mirror set the `KS_MIRROR` environment variable
+poiniting to the mirror URL.
+
+```shell
+export KS_MIRROR="https://dl.rockylinux.org/pub/rocky/8"
 ```
 
 ## Building an image

rocky8/http/rocky.ks.in → rocky8/http/rocky8.ks.pkrtpl.hcl

@@ -1,7 +1,6 @@
-url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/" ${KS_PROXY}
-url --mirrorlist="http://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=BaseOS-8" ${KS_PROXY}
-repo --name="AppStream" --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?release=8&arch=x86_64&repo=AppStream-8" ${KS_PROXY}
-repo --name="Extras" --mirrorlist="https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=extras-8" ${KS_PROXY}
+url ${KS_OS_REPOS} ${KS_PROXY}
+repo --name="AppStream" ${KS_APPSTREAM_REPOS} ${KS_PROXY}
+repo --name="Extras" ${KS_EXTRAS_REPOS} ${KS_PROXY}
 
 eula --agreed
 

rocky8/rocky8.pkr.hcl

@@ -24,29 +24,77 @@ variable "rocky_sha256sum_url" {
   default = "http://download.rockylinux.org/pub/rocky/8/isos/x86_64/CHECKSUM"
 }
 
+# use can use "--url" to specify the exact url for os repo
+# for ex. "--url='https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os'"
+variable "ks_os_repos" {
+  type    = string
+  default = "--mirrorlist='http://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=BaseOS-8'"
+}
+
+# Use --baseurl to specify the exact url for appstream repo
+# for ex. "--baseurl='https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os'"
+variable "ks_appstream_repos" {
+  type    = string
+  default = "--mirrorlist='https://mirrors.rockylinux.org/mirrorlist?release=8&arch=x86_64&repo=AppStream-8'"
+}
+
+# Use --baseurl to specify the exact url for extras repo
+# for ex. "--baseurl='https://dl.rockylinux.org/pub/rocky/8/extras/x86_64/os'"
+variable "ks_extras_repos" {
+  type    = string
+  default = "--mirrorlist='https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=extras-8'"
+}
+
+variable ks_proxy {
+  type    = string
+  default = "${env("KS_PROXY")}"
+}
+
+variable ks_mirror {
+  type    = string
+  default = "${env("KS_MIRROR")}"
+}
+
+locals {
+  ks_proxy           = var.ks_proxy != "" ? "--proxy=${var.ks_proxy}" : ""
+  ks_os_repos        = var.ks_mirror != "" ? "--url=${var.ks_mirror}/BaseOS/x86_64/os" : var.ks_os_repos
+  ks_appstream_repos = var.ks_mirror != "" ? "--baseurl=${var.ks_mirror}/AppStream/x86_64/os" : var.ks_appstream_repos
+  ks_extras_repos    = var.ks_mirror != "" ? "--baseurl=${var.ks_mirror}/extras/x86_64/os" : var.ks_extras_repos
+}
+
 source "qemu" "rocky8" {
-  boot_command     = ["<up><tab> ", "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rocky.ks ", "console=ttyS0 inst.cmdline", "<enter>"]
+  boot_command     = ["<up><tab> ", "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rocky8.ks ", "console=ttyS0 inst.cmdline", "<enter>"]
   boot_wait        = "3s"
   communicator     = "none"
   disk_size        = "4G"
   headless         = true
-  http_directory   = "http"
   iso_checksum     = "file:${var.rocky_sha256sum_url}"
   iso_url          = var.rocky_iso_url
   memory           = 2048
   qemuargs         = [["-serial", "stdio"]]
   shutdown_timeout = "1h"
+  http_content = {
+    "/rocky8.ks" = templatefile("${path.root}/http/rocky8.ks.pkrtpl.hcl",
+      {
+        KS_PROXY           = local.ks_proxy,
+        KS_OS_REPOS        = local.ks_os_repos,
+        KS_APPSTREAM_REPOS = local.ks_appstream_repos,
+        KS_EXTRAS_REPOS    = local.ks_extras_repos
+      }
+    )
+  }
 }
 
 build {
   sources = ["source.qemu.rocky8"]
 
   post-processor "shell-local" {
     inline = [
-      "SOURCE=rocky8",
+      "SOURCE=${source.name}",
       "OUTPUT=${var.filename}",
       "source ../scripts/fuse-nbd",
-      "source ../scripts/fuse-tar-root"
+      "source ../scripts/fuse-tar-root",
+      "rm -rf output-${source.name}",
     ]
     inline_shebang = "/bin/bash -e"
   }

scripts/fuse-tar-root

@@ -61,7 +61,7 @@ if [ "${DETECT_BLS_BOOT}" -eq 1 ]; then
     fi
 fi
 
-gzip --best "${TARFILE}"
+gzip --best --force "${TARFILE}"
 
 if [ -n "$MANIFEST" ]; then
     echo "Creating manifest..."