From 8c3cbddcc9711d8c360d4809624868fce8fa9a37 Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Tue, 21 Nov 2023 20:43:14 -0600 Subject: [PATCH 1/5] added .md extension --- .github/{CONTRIBUTING => CONTRIBUTING.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{CONTRIBUTING => CONTRIBUTING.md} (100%) diff --git a/.github/CONTRIBUTING b/.github/CONTRIBUTING.md similarity index 100% rename from .github/CONTRIBUTING rename to .github/CONTRIBUTING.md From bdeb9f4f2e30ab07ac9abfedd766207b43b35266 Mon Sep 17 00:00:00 2001 From: TheHitman1977 <6432150+ajschroeder@users.noreply.github.com> Date: Tue, 21 Nov 2023 20:48:58 -0600 Subject: [PATCH 2/5] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 31 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..098a438 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Packer Host Machine (please complete the following information):** + - OS: [e.g. CentOS] + - Version [e.g. 1.0.0] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From 18588360d9fc0752a57a7d161f5060134198cb9f Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:30:03 -0600 Subject: [PATCH 3/5] docs: remove old info and rephrase warnings --- README.md | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 16cb1e0..c6639c0 100644 --- a/README.md +++ b/README.md @@ -501,23 +501,10 @@ vm_disk_partitions = [ Below is an example of a partition layout for a VM template that boots with BIOS and uses LVM. The first partition is a 1GB primary partition and is mounted as /boot, finally the second partition consumes the rest of the free space (noted by -1 for space) and is setup for LVM. > [!WARNING] -> The mount point of `/boot` also is not arbitrary +> The mount point of `/boot` is used by the templates and is required. ```hcl vm_disk_partitions = [ - { - name = "bios_grub" - size = 1, - format = { - label = "", - fstype = "", - }, - mount = { - path = "", - options = "", - }, - volume_group = "", - }, { name = "boot" size = 1000, @@ -551,7 +538,7 @@ vm_disk_partitions = [ Below is an example of a partition layout for a VM template that uses LVM and has extra partitions with mount options required by CIS for hardening a system. The first partition is a 1GB primary partition and is mounted as /boot, finally the second partition consumes the rest of the free space (noted by -1 for space) and is setup for LVM. > [!WARNING] -> The mount point of `/boot` also is not arbitrary +> The mount point of `/boot` is used by the templates and is required. ```hcl title="config/linux-storage.pkrvars.hcl" // VM Storage Settings @@ -713,7 +700,7 @@ vm_disk_lvm = [ - Networking configurations other than DHCP for templates # Contributing -Contributions +Contributions are welcome, please read the [CONTRIBUTING](.github/CONTRIBUTING.md) document for more details. # Credits The repository is modeled after the [VMware Packer Examples][packer-examples-for-vsphere] repository. As someone who initially struggled with organization of a packer project, the VMware repository helped me significantly. From fc8f0f10eea5166ead06f90f7e9394443a16143b Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:30:51 -0600 Subject: [PATCH 4/5] docs: rewrite contributing doc --- .github/CONTRIBUTING.md | 131 ++++++++++++++++++++++++++++++++++------ 1 file changed, 114 insertions(+), 17 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 07787fe..38696a7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,28 +1,125 @@ -# How to contribute +# Contributing Guidelines -I'm really glad you're reading this, because community driven, open-source projects need volunteer developers. +Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or +additional documentation, we greatly value feedback and contributions from our community. -## Testing +Please read through this document before submitting any issues or pull requests to ensure we have all the necessary +information to effectively respond to your bug report or contribution. -Until actual tests can be developed, I ask that you test any *major* changes to Packer builds. What's a major change? Anything other than changing CPU, RAM, disk size would be considered a major change to a build. +## Reporting Bugs, Features, and Enhancements -## Submitting changes +We welcome you to use the GitHub issue tracker to report bugs or suggest features and enhancements. -Please send a [GitHub Pull Request to proxmox-packer-examples](https://github.com/ajschroeder/proxmox-packer-examples/pull/new/main) with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)). Please follow our coding conventions (below) and make sure all of your commits are atomic (one feature per commit). +When filing an issue, please check existing open, or recently closed, issues to make sure someone else hasn't already +reported the issue. -Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this: +Please try to include as much information as you can. Details like these are incredibly useful: - $ git commit -m "A brief summary of the commit - > - > A paragraph describing what changed and its impact." +- A reproducible test case or series of steps. +- Any modifications you've made relevant to the bug. +- Anything unusual about your environment or deployment. -## Coding conventions +## Contributing via Pull Requests -Start reading the code and you'll get the hang of it. We optimize for readability: +Contributions via pull requests are appreciated. Before sending us a pull request, please ensure that: - * We indent using two spaces (soft tabs) - * We ALWAYS put spaces after list items and method parameters (`[1, 2, 3]`, not `[1,2,3]`), around operators (`x += 1`, not `x+=1`), and around hash arrows. - * This is open source software. Consider the people who will read your code, and make it look nice for them. It's sort of like driving a car: Perhaps you love doing donuts when you're alone, but with passengers the goal is to make the ride as smooth as possible. +1. You [open a discussion](https://github.com/ajschroeder/proxmox-packer-examples/discussions) to discuss any significant work with the maintainer(s). +1. You open an issue and link your pull request to the issue for context. +1. You are working against the latest source on the `develop` branch. +1. You check existing open, and recently merged, pull requests to make sure someone else hasn't already addressed + the problem. -Thanks, -AJ Schroeder +To send us a pull request, please: + +1. Fork the repository. +1. Modify the source; please focus on the **specific** change you are contributing. +1. Ensure local tests pass. +1. Updated the documentation, if required. +1. Commit to your fork [using a clear commit messages](http://chris.beams.io/posts/git-commit/). We ask you to + lease use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/). +1. Send us a pull request, answering any default questions in the pull request. +1. Pay attention to any automated failures reported in the pull request, and stay involved in the conversation. + +GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and +[creating a pull request](https://help.github.com/articles/creating-a-pull-request/). + +### Contributor Flow + +This is a rough outline of what a contributor's workflow looks like: + +- Create a topic branch from where you want to base your work. +- Make commits of logical units. +- Make sure your commit messages are [in the proper format](http://chris.beams.io/posts/git-commit/). +- Push your changes to a topic branch in your fork of the repository. +- Submit a pull request. + +Example: + +```shell +git remote add upstream https://github.com/ajschroeder/proxmox-packer-examples.git +git checkout -b feat/foo develop +git commit -s -a +git push origin feat/foo +``` + +### Staying In Sync With Upstream + +When your branch gets out of sync with the `proxmox-packer-examples/develop` branch, use the following to update: + +```shell +git checkout feat/foo +git fetch -a +git pull --rebase upstream develop +git push --force-with-lease origin feat/foo +``` + +### Updating Pull Requests + +If your pull request fails to pass or needs changes based on code review, you'll most likely want to squash these +changes into existing commits. + +If your pull request contains a single commit or your changes are related to the most recent commit, you can simply +amend the commit. + +```shell +git add . +git commit --amend +git push --force-with-lease origin feat/foo +``` + +If you need to squash changes into an earlier commit, you can use: + +```shell +git add . +git commit --fixup +git rebase -i --autosquash develop +git push --force-with-lease origin feat/foo +``` + +Be sure to add a comment to the pull request indicating your new changes are ready to review, as GitHub does not +generate a notification when you `git push`. + +### Formatting Commit Messages + +We follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/). + +Be sure to include any related GitHub issue references in the commit message. + +See [GFM syntax](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) for referencing +issues and commits. + +## Reporting Bugs and Creating Issues + +When opening a new issue, try to roughly follow the commit message format conventions above. + +## Finding Contributions to Work On + +Looking at the existing issues is a great way to find something to contribute on. If you have an idea you'd like to +discuss, [open a discussion](https://github.com/ajschroeder/proxmox-packer-examples/discussions). + +## Licensing + +See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. + +We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) +for larger changes. \ No newline at end of file From a93e020cf75091698539bb76f78c35d5ee9bd28c Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Thu, 23 Nov 2023 08:31:09 -0600 Subject: [PATCH 5/5] docs: add new pull request template --- .github/pull_request_template.md | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..c7e35bf --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,60 @@ + + +# + +## Summary of Pull Request + + + +## Type of Pull Request + + + +- [ ] This is a bugfix. `type/bug` +- [ ] This is an enhancement or feature. `type/feature` or `type/enhancement` +- [ ] This is a documentation update. `type/docs` +- [ ] This is a refactoring update. `type/refactor` +- [ ] This is a chore. `type/chore` +- [ ] This is something else. + Please describe: + +## Related to Existing Issues + + + +Issue Number: N/A + +## Test and Documentation Coverage + + + +- [ ] Tests have been completed. +- [ ] Documentation has been added or updated. + +## Breaking Changes? + + + +- [ ] Yes, there are breaking changes. +- [ ] No, there are no breaking changes. + + \ No newline at end of file