aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2025-12-26 15:02:04 +0700
committerShulhan <ms@kilabit.info>2025-12-26 15:50:22 +0700
commit42ad2744c1122eeb6e33972ed34a87567a690a57 (patch)
tree5fe7211e8a3831dbc75419d1814da386f6483e81
parent058f6729af0dc2f9a367a268e2d387a9f922406e (diff)
downloadcompute-archlinux-image-builder-42ad2744c1122eeb6e33972ed34a87567a690a57.tar.xz
all: remove pacman-init service and ops-agent config.yaml
The original pacman-init.service usage is to populate the pacman keyrings. Since we install archlinux-keyring package at pacstrap, we did not need to do it anymore. On ops-agent, the latest package released that include the same config.yaml.
-rw-r--r--Makefile23
-rw-r--r--awwan.env2
-rwxr-xr-xbuild-arch-gce12
-rw-r--r--current-images.txt39
-rw-r--r--sys/etc/google-cloud-ops-agent/config.yaml8
-rw-r--r--sys/etc/systemd/system/pacman-init.service12
6 files changed, 49 insertions, 47 deletions
diff --git a/Makefile b/Makefile
index e68fd9a..aac02ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
.PHONY: all
-all: image publish
+all: image image.publish
.PHONY: image
image:
@@ -11,20 +11,19 @@ image:
image-qemu:
sudo IMAGE_QEMU=1 ./build-arch-gce
-.PHONY: publish
-publish:
+.PHONY: image.publish
+image.publish:
awwan local gcloud-image-publish.aww 5-
awwan local gcloud-image-cleanup.aww 5-
-.PHONY: test
-test:
+.PHONY: image.test
+image.test:
awwan local gcloud-image-test.aww 4-18
-## Preview the .md files in local using ciigo [1].
-.PHONY: serve-doc
-serve-doc:
+## Preview the .md files in local using [ciigo].
+## Open http://127.0.0.1:8080/README.html to preview the README.
+##
+## [ciigo]: https://sr.ht/~shulhan/ciigo/
+.PHONY: serve.doc
+serve.doc:
ciigo -address 127.0.0.1:8080 serve .
- # Open http://127.0.0.1:8080/README.html to preview the README.
-
-
-## [1] https://sr.ht/~shulhan/ciigo/
diff --git a/awwan.env b/awwan.env
index 8924a25..baae6df 100644
--- a/awwan.env
+++ b/awwan.env
@@ -12,5 +12,5 @@ zone = asia-southeast1-b
storage = kilabit-staging
[host]
-image = arch-v20251225
+image = arch-v20251226
name = arch-test
diff --git a/build-arch-gce b/build-arch-gce
index ca03f13..7a9559f 100755
--- a/build-arch-gce
+++ b/build-arch-gce
@@ -122,9 +122,6 @@ cp ./sys/etc/systemd/journald.conf.d/00-google.conf $mount_dir/etc/systemd/journ
echo '-- Configuring ssh.'
cp ./sys/etc/ssh/sshd_config $mount_dir/etc/ssh/
-echo '-- Creating pacman-init service.'
-cp ./sys/etc/systemd/system/pacman-init.service $mount_dir/etc/systemd/system/
-
echo '-- Configuring initcpio.'
cp ./sys/etc/mkinitcpio.conf $mount_dir/etc/
cp ./sys/etc/mkinitcpio.d/linux.preset $mount_dir/etc/mkinitcpio.d/
@@ -150,8 +147,6 @@ arch-chroot -- "$mount_dir" /bin/bash -s <<-'EOS'
set -eEuo pipefail
trap 'echo "Error: \`$BASH_COMMAND\` exited with status $?"' ERR
- ls -l /etc/pacman.d/gnupg/
-
echo '-- Configuring time.'
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
systemctl --quiet enable systemd-timesyncd.service
@@ -166,7 +161,7 @@ arch-chroot -- "$mount_dir" /bin/bash -s <<-'EOS'
echo '-- Enabling sshd service.'
systemctl --quiet enable sshd.service
- echo '-- Installing google-compute-engine and guest-agent.'
+ echo '-- Installing google-compute-engine and ops-agent.'
## Import the key for build.kilabit.info repository.
pacman-key --recv-key 4A5360B500C9C4F0
pacman-key --lsign-key 4A5360B500C9C4F0
@@ -177,7 +172,6 @@ arch-chroot -- "$mount_dir" /bin/bash -s <<-'EOS'
google-compute-engine \
google-cloud-ops-agent-git
- echo '-- Enabling google-cloud-ops-agent.service'
systemctl --quiet enable google-cloud-ops-agent.service
echo '-- Running mkinitcpio.'
@@ -197,10 +191,6 @@ arch-chroot -- "$mount_dir" /bin/bash -s <<-'EOS'
fi
EOS
-echo '- Configuring Google Cloud Ops Agent.'
-mkdir -p $mount_dir/etc/google-cloud-ops-agent/
-cp ./sys/etc/google-cloud-ops-agent/config.yaml $mount_dir/etc/google-cloud-ops-agent/
-
echo '- Configuring boot loader.'
cp ./sys/efi/loader/loader.conf $mount_dir/boot/loader/
cp ./sys/efi/loader/entries/arch.conf $mount_dir/boot/loader/entries/
diff --git a/current-images.txt b/current-images.txt
index a63c73d..4bac44a 100644
--- a/current-images.txt
+++ b/current-images.txt
@@ -1,7 +1,7 @@
[
{
- "archiveSizeBytes": "1706681216",
- "creationTimestamp": "2025-12-25T04:57:15.452-08:00",
+ "archiveSizeBytes": "1661890432",
+ "creationTimestamp": "2025-12-25T05:29:49.707-08:00",
"description": "Arch linux image with ops-agent. See https://github.com/shuLhan/compute-archlinux-image-builder",
"diskSizeGb": "10",
"enableConfidentialCompute": false,
@@ -17,7 +17,7 @@
"type": "VIRTIO_SCSI_MULTIQUEUE"
}
],
- "id": "8142640788025674309",
+ "id": "7892614657072988835",
"kind": "compute#image",
"labelFingerprint": "42WmSpB8rSM=",
"name": "arch-v20251225",
@@ -31,5 +31,38 @@
"storageLocations": [
"asia"
]
+ },
+ {
+ "archiveSizeBytes": "961868992",
+ "creationTimestamp": "2025-12-25T23:14:59.097-08:00",
+ "description": "Arch linux image with ops-agent. See https://github.com/shuLhan/compute-archlinux-image-builder",
+ "diskSizeGb": "10",
+ "enableConfidentialCompute": false,
+ "family": "arch",
+ "guestOsFeatures": [
+ {
+ "type": "GVNIC"
+ },
+ {
+ "type": "UEFI_COMPATIBLE"
+ },
+ {
+ "type": "VIRTIO_SCSI_MULTIQUEUE"
+ }
+ ],
+ "id": "7907743400200473373",
+ "kind": "compute#image",
+ "labelFingerprint": "42WmSpB8rSM=",
+ "name": "arch-v20251226",
+ "rawDisk": {
+ "containerType": "TAR",
+ "source": ""
+ },
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/kilabit/global/images/arch-v20251226",
+ "sourceType": "RAW",
+ "status": "READY",
+ "storageLocations": [
+ "asia"
+ ]
}
]
diff --git a/sys/etc/google-cloud-ops-agent/config.yaml b/sys/etc/google-cloud-ops-agent/config.yaml
deleted file mode 100644
index 402be29..0000000
--- a/sys/etc/google-cloud-ops-agent/config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-logging:
- receivers:
- syslog:
- type: systemd_journald
- service:
- pipelines:
- default_pipeline:
- receivers: [syslog]
diff --git a/sys/etc/systemd/system/pacman-init.service b/sys/etc/systemd/system/pacman-init.service
deleted file mode 100644
index 60af106..0000000
--- a/sys/etc/systemd/system/pacman-init.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Pacman keyring initialization
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/pacman-key --recv-key B24B7E71D51210D9292E1B3E4A5360B500C9C4F0
-ExecStart=/usr/bin/pacman-key --lsign-key B24B7E71D51210D9292E1B3E4A5360B500C9C4F0
-
-[Install]
-WantedBy=multi-user.target