diff --git a/docs/deployment.md b/docs/deployment.md index 67e231888..15cadc3e4 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -247,7 +247,7 @@ Matchbox can serve OS images in development or lab environments to reduce bandwi Download a recent Fedora CoreOS or Flatcar Linux release. ``` -$ ./scripts/get-fedora-coreos stable 32.20200923.3.0 . +$ ./scripts/get-fedora-coreos stable 36.20220618.3.1 . $ ./scripts/get-flatcar stable 2605.6.0 . ``` @@ -255,11 +255,9 @@ Move the images to `/var/lib/matchbox/assets`, ``` /var/lib/matchbox/assets/fedora-coreos/ -├── fedora-coreos-32.20200923.3.0-live-initramfs.x86_64.img -├── fedora-coreos-32.20200923.3.0-live-kernel-x86_64 -├── fedora-coreos-32.20200923.3.0-live-rootfs.x86_64.img -├── fedora-coreos-32.20200923.3.0-metal.x86_64.raw.xz -└── fedora-coreos-32.20200923.3.0-metal.x86_64.raw.xz.sig +├── fedora-coreos-36.20220618.3.1-live-initramfs.x86_64.img +├── fedora-coreos-36.20220618.3.1-live-kernel-x86_64 +├── fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img /var/lib/matchbox/assets/flatcar/ └── 2605.6.0 diff --git a/docs/getting-started-docker.md b/docs/getting-started-docker.md index defcb3766..2a83f5da9 100644 --- a/docs/getting-started-docker.md +++ b/docs/getting-started-docker.md @@ -29,7 +29,7 @@ $ cd matchbox Download Fedora CoreOS or Flatcar Linux image assets to `examples/assets`. ```sh -$ ./scripts/get-fedora-coreos stable 33.20210117.3.2 ./examples/assets +$ ./scripts/get-fedora-coreos stable 36.20220618.3.1 ./examples/assets $ ./scripts/get-flatcar stable 2605.6.0 ./examples/assets ``` diff --git a/docs/getting-started.md b/docs/getting-started.md index e2b6f3c81..4e747d319 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -99,15 +99,13 @@ resource "matchbox_profile" "fedora-coreos-install" { name = "worker" kernel = "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-kernel-x86_64" initrd = [ - "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img", - "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img" + "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img" ] args = [ - "rd.neednet=1", + "coreos.live.rootfs_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img", "coreos.inst.install_dev=/dev/sda", "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", - "coreos.inst.image_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-metal.x86_64.raw.xz", "console=tty0", "console=ttyS0", ] diff --git a/examples/README.md b/examples/README.md index fe7683a0c..ad357f899 100644 --- a/examples/README.md +++ b/examples/README.md @@ -21,7 +21,7 @@ These examples mount raw Matchbox objects into a Matchbox server's `/var/lib/mat | Name | Description | FS | Docs | |---------------|------------------------------|-----|-------| -| fedora-coreos | Fedora CoreOS live PXE | RAM | [docs](https://docs.fedoraproject.org/en-US/fedora-coreos/live-booting-ipxe/) | +| fedora-coreos | Fedora CoreOS live PXE | RAM | [docs](https://docs.fedoraproject.org/en-US/fedora-coreos/live-booting/) | | fedora-coreos-install | Fedora CoreOS install | Disk | [docs](https://docs.fedoraproject.org/en-US/fedora-coreos/bare-metal/) | | flatcar | Flatcar Linux live PXE | RAM | [docs](https://docs.flatcar-linux.org/os/booting-with-ipxe/) | | flatcar-install | Flatcar Linux install | Disk | [docs](https://docs.flatcar-linux.org/os/booting-with-ipxe/) | diff --git a/examples/profiles/fedora-coreos-install.json b/examples/profiles/fedora-coreos-install.json index 8b1d32cc8..13bd2e817 100644 --- a/examples/profiles/fedora-coreos-install.json +++ b/examples/profiles/fedora-coreos-install.json @@ -2,15 +2,14 @@ "id": "fedora-coreos-install", "name": "Fedora CoreOS install to disk", "boot": { - "kernel": "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-kernel-x86_64", + "kernel": "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-kernel-x86_64", "initrd": [ - "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-initramfs.x86_64.img", - "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-rootfs.x86_64.img" + "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-initramfs.x86_64.img" ], "args": [ + "coreos.live.rootfs_url=http://matchbox.example.com:8080/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img", "coreos.inst.install_dev=/dev/sda", "coreos.inst.ignition_url=http://matchbox.example.com:8080/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", - "coreos.inst.image_url=http://matchbox.example.com:8080/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-metal.x86_64.raw.xz", "console=tty0", "console=ttyS0" ] diff --git a/examples/profiles/fedora-coreos.json b/examples/profiles/fedora-coreos.json index 8123c25a8..8bd7ecfda 100644 --- a/examples/profiles/fedora-coreos.json +++ b/examples/profiles/fedora-coreos.json @@ -2,16 +2,15 @@ "id": "fedora-coreos", "name": "Fedora CoreOS", "boot": { - "kernel": "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-kernel-x86_64", + "kernel": "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-kernel-x86_64", "initrd": [ - "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-initramfs.x86_64.img", - "/assets/fedora-coreos/fedora-coreos-33.20210117.3.2-live-rootfs.x86_64.img" + "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-initramfs.x86_64.img" ], "args": [ + "coreos.live.rootfs_url=http://matchbox.example.com:8080/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img", "ignition.firstboot", "ignition.platform.id=metal", "ignition.config.url=http://matchbox.example.com:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}", - "systemd.unified_cgroup_hierarchy=0", "console=tty0", "console=ttyS0" ] diff --git a/examples/terraform/fedora-coreos-install/profiles.tf b/examples/terraform/fedora-coreos-install/profiles.tf index 31aa40d48..dfa73ca9e 100644 --- a/examples/terraform/fedora-coreos-install/profiles.tf +++ b/examples/terraform/fedora-coreos-install/profiles.tf @@ -3,15 +3,13 @@ resource "matchbox_profile" "fedora-coreos-install" { name = "worker" kernel = "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-kernel-x86_64" initrd = [ - "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img", - "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img" + "https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-initramfs.x86_64.img" ] args = [ - "rd.neednet=1", + "coreos.live.rootfs_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-live-rootfs.x86_64.img", "coreos.inst.install_dev=/dev/sda", "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", - "coreos.inst.image_url=https://builds.coreos.fedoraproject.org/prod/streams/${var.os_stream}/builds/${var.os_version}/x86_64/fedora-coreos-${var.os_version}-metal.x86_64.raw.xz", "console=tty0", "console=ttyS0", ] diff --git a/examples/terraform/fedora-coreos-install/terraform.tfvars.example b/examples/terraform/fedora-coreos-install/terraform.tfvars.example index dcd2f96a7..01b516272 100644 --- a/examples/terraform/fedora-coreos-install/terraform.tfvars.example +++ b/examples/terraform/fedora-coreos-install/terraform.tfvars.example @@ -1,4 +1,4 @@ matchbox_http_endpoint = "http://matchbox.example.com:8080" matchbox_rpc_endpoint = "matchbox.example.com:8081" -os_version = "32.20200923.3.0" +os_version = "36.20220618.3.1" ssh_authorized_key = "YOUR_SSH_KEY" diff --git a/examples/terraform/fedora-coreos-install/variables.tf b/examples/terraform/fedora-coreos-install/variables.tf index 395cf3446..636273f49 100644 --- a/examples/terraform/fedora-coreos-install/variables.tf +++ b/examples/terraform/fedora-coreos-install/variables.tf @@ -16,7 +16,7 @@ variable "os_stream" { variable "os_version" { type = string - description = "Fedora CoreOS version to PXE and install (e.g. 32.20200923.3.0)" + description = "Fedora CoreOS version to PXE and install (e.g. 36.20220618.3.1)" } variable "ssh_authorized_key" { diff --git a/scripts/README.md b/scripts/README.md index 737f7420c..2e941f546 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -13,11 +13,9 @@ This will create: ``` examples/assets/fedora-coreos/ -├── fedora-coreos-32.20200923.3.0-live-initramfs.x86_64.img -├── fedora-coreos-32.20200923.3.0-live-kernel-x86_64 -├── fedora-coreos-32.20200923.3.0-live-rootfs.x86_64.img -├── fedora-coreos-32.20200923.3.0-metal.x86_64.raw.xz -└── fedora-coreos-32.20200923.3.0-metal.x86_64.raw.xz.sig +├── fedora-coreos-36.20220618.3.1-live-initramfs.x86_64.img +├── fedora-coreos-36.20220618.3.1-live-kernel-x86_64 +├── fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img ``` ## get-flatcar diff --git a/scripts/get-fedora-coreos b/scripts/get-fedora-coreos index 20991baea..5a363b114 100755 --- a/scripts/get-fedora-coreos +++ b/scripts/get-fedora-coreos @@ -5,7 +5,7 @@ set -eou pipefail STREAM=${1:-"stable"} -VERSION=${2:-"33.20210117.3.2"} +VERSION=${2:-"36.20220618.3.1"} DEST_DIR=${3:-"$PWD/examples/assets"} DEST=$DEST_DIR/fedora-coreos BASE_URL=https://builds.coreos.fedoraproject.org/prod/streams/$STREAM/builds/$VERSION/x86_64 @@ -34,10 +34,3 @@ curl -# $BASE_URL/fedora-coreos-$VERSION-live-initramfs.x86_64.img -o $DEST/fedo # rootfs echo "fedora-coreos-$VERSION-live-rootfs.x86_64.img" curl -# $BASE_URL/fedora-coreos-$VERSION-live-rootfs.x86_64.img -o $DEST/fedora-coreos-$VERSION-live-rootfs.x86_64.img - -# Install image -echo "fedora-coreos-$VERSION-metal.x86_64.raw.xz" -curl -# $BASE_URL/fedora-coreos-$VERSION-metal.x86_64.raw.xz -o $DEST/fedora-coreos-$VERSION-metal.x86_64.raw.xz -echo "fedora-coreos-$VERSION-metal.x86_64.raw.xz.sig" -curl -# $BASE_URL/fedora-coreos-$VERSION-metal.x86_64.raw.xz.sig -o $DEST/fedora-coreos-$VERSION-metal.x86_64.raw.xz.sig -