From 763654ac8f88787de7c4d64e18aaf33e82990719 Mon Sep 17 00:00:00 2001 From: Jason Lingohr Date: Tue, 25 Jun 2024 15:05:10 +1000 Subject: [PATCH 1/2] fix(docs): Mention alternate valid use of Volid's for containers (#1407) Signed-off-by: Jason Lingohr Co-authored-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com> --- docs/resources/virtual_environment_container.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/resources/virtual_environment_container.md b/docs/resources/virtual_environment_container.md index 04f854a2..7ef197f5 100644 --- a/docs/resources/virtual_environment_container.md +++ b/docs/resources/virtual_environment_container.md @@ -41,6 +41,8 @@ resource "proxmox_virtual_environment_container" "ubuntu_container" { operating_system { template_file_id = proxmox_virtual_environment_file.latest_ubuntu_22_jammy_lxc_img.id + # Or you can use a volume ID, as obtained from a "pvesm list " + # template_file_id = "local:vztmpl/jammy-server-cloudimg-amd64.tar.gz" type = "ubuntu" } @@ -187,6 +189,8 @@ output "ubuntu_container_public_key" { - `node_name` - (Required) The name of the node to assign the container to. - `operating_system` - (Required) The Operating System configuration. - `template_file_id` - (Required) The identifier for an OS template file. + The ID format is `:/`, for example `local:iso/jammy-server-cloudimg-amd64.tar.gz`. Can be also taken from + `proxmox_virtual_environment_download_file` resource, or from the output of `pvesm list `. - `type` - (Optional) The type (defaults to `unmanaged`). - `alpine` - Alpine. - `archlinux` - Arch Linux. From 59840a66cc8254d5ce620375200d8c67a2d69732 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 05:06:13 +0000 Subject: [PATCH 2/2] docs: add lingfish as a contributor for doc (#1410) * docs: update CONTRIBUTORS.md * docs: update .all-contributorsrc --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 9 +++++++++ CONTRIBUTORS.md | 1 + 2 files changed, 10 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 3a6c2f45..8516eb49 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1078,6 +1078,15 @@ "contributions": [ "code" ] + }, + { + "login": "lingfish", + "name": "Jason Lingohr", + "avatar_url": "https://avatars.githubusercontent.com/u/1295960?v=4", + "profile": "https://blog.lucid.net.au", + "contributions": [ + "doc" + ] } ], "contributorsPerLine": 7, diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 19028f75..06a5ef84 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -153,6 +153,7 @@ Karlie Meads
Karlie Meads

💻 Charles Rodrigues
Charles Rodrigues

📖 Connor Creek
Connor Creek

💻 + Jason Lingohr
Jason Lingohr

📖