diff --git a/docs/deployment.md b/docs/deployment.md index 67e23188..f995916d 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,11 @@ 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 +├── fedora-coreos-36.20220618.3.1-metal.x86_64.raw.xz +└── fedora-coreos-36.20220618.3.1-metal.x86_64.raw.xz.sig /var/lib/matchbox/assets/flatcar/ └── 2605.6.0 diff --git a/docs/getting-started-docker.md b/docs/getting-started-docker.md index defcb376..2a83f5da 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/examples/profiles/fedora-coreos-install.json b/examples/profiles/fedora-coreos-install.json index 8b1d32cc..81283b52 100644 --- a/examples/profiles/fedora-coreos-install.json +++ b/examples/profiles/fedora-coreos-install.json @@ -2,15 +2,15 @@ "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", + "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img" ], "args": [ "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", + "coreos.inst.image_url=http://matchbox.example.com:8080/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-metal.x86_64.raw.xz", "console=tty0", "console=ttyS0" ] diff --git a/examples/profiles/fedora-coreos.json b/examples/profiles/fedora-coreos.json index 8123c25a..7e8b8906 100644 --- a/examples/profiles/fedora-coreos.json +++ b/examples/profiles/fedora-coreos.json @@ -2,10 +2,10 @@ "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", + "/assets/fedora-coreos/fedora-coreos-36.20220618.3.1-live-rootfs.x86_64.img" ], "args": [ "ignition.firstboot", diff --git a/examples/terraform/fedora-coreos-install/terraform.tfvars.example b/examples/terraform/fedora-coreos-install/terraform.tfvars.example index dcd2f96a..01b51627 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 395cf344..636273f4 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 737f7420..9e84fd96 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -13,11 +13,11 @@ 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 +├── fedora-coreos-36.20220618.3.1-metal.x86_64.raw.xz +└── fedora-coreos-36.20220618.3.1-metal.x86_64.raw.xz.sig ``` ## get-flatcar diff --git a/scripts/get-fedora-coreos b/scripts/get-fedora-coreos index 20991bae..e7ba1330 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