Merge branch 'release/v1' into parameter-space-error

Signed-off-by: Simpcyclassy <[email protected]>

.github/workflows/close-issues.yaml

@@ -4,16 +4,16 @@
 name: Close Completed Issues
 
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
     branches:
       - release/*
 
 jobs:
-  closeIssueOnPrMergeTrigger:
+  closeIssue:
     runs-on: ubuntu-latest
     steps:
       - name: Closes issues related to a merged pull request.
-        uses: ldez/gha-mjolnir@v1.0.3
+        uses: docker://carolynvs/gha-mjolnir:v1.0.3-pullrequesttarget
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,10 +1,12 @@
 /docs/public/
 /docs/content/operator
+/docs/sources/
 /bin
 /porter
 .DS_Store
 /build/git_askpass.sh
 tests/smoke/mybuns/
+.env
 
 .cnab
 examples/**/Dockerfile

CODE_OF_CONDUCT.md

@@ -3,7 +3,7 @@
 ## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
+contributors and maintainers pledge to make participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
 level of experience, education, socio-economic status, nationality, personal

CONTRIBUTING.md

@@ -19,6 +19,7 @@
 * [Code structure and practices](#code-structure-and-practices)
   * [What is the general code layout?](#what-is-the-general-code-layout)
   * [Logging](#logging)
+  * [Breaking Changes](#breaking-changes)
 * [Infrastructure](#infrastructure)
   * [CDN Setup](#cdn-setup)
   * [Releases](#releases)
@@ -54,7 +55,7 @@ We have good first issues for new contributors and help wanted issues for our ot
   because they are not finished being designed or we aren't sure if we want the
   feature, etc.
 
-Maintainers will do our best regularly make new issues for you to solve and then
+Maintainers will do their best to regularly make new issues for you to solve and then
 help out as you work on them. 💖
 
 We have a [roadmap] that will give you a good idea of the
@@ -63,7 +64,7 @@ you would like to work on after you have tackled an issue or two to learn how to
 contribute to Porter. If you have a big idea for Porter, learn [how to propose
 a change to Porter][pep].
 
-Another great way to contribute is to create a mixin! You can start use the
+Another great way to contribute is to create a mixin! You can start using the
 [Porter Skeletor][skeletor] repository as a template to start, along with the
 [Mixin Developer Guide][mixin-dev-guide].
 
@@ -94,7 +95,7 @@ things where the motivation/problem is unambiguous.
 
 If there isn't an issue for your PR, please make an issue first and explain the
 problem or motivation for the change you are proposing. When the solution isn't
-straightforward, for example "Implement missing command X", then also outline
+straightforward, for example, "Implement missing command X", then also outline
 your proposed solution. Your PR will go smoother if the solution is agreed upon
 before you've spent a lot of time implementing it.
 
@@ -197,7 +198,7 @@ repository, you can amend your commit with the sign-off by running
    review, or ping in [slack][slack]. Sometimes we have busy days, sick days,
    weekends and vacations, so a little patience is appreciated! 🙇‍♀️
 1. The reviewer will leave feedback.
-    * `nits`: These are suggestions that you may decide incorporate into your pull
+    * `nits`: These are suggestions that you may decide to incorporate into your pull
       request or not without further comment.
     * It can help to put a 👍 on comments that you have implemented so that you
       can keep track.
@@ -235,7 +236,7 @@ kills contributor momentum.
 
 # Contribution Ladder
 
-Our [contribution ladder][ladder] defines the roles and responsibilities on this
+Our [contribution ladder][ladder] defines the roles and responsibilities for this
 project and how to participate with the goal of moving from a user to a
 maintainer.
 
@@ -574,6 +575,20 @@ we send regular command output to `Out` and debug information to `Err`. It
 allows us to then run the command and see the debug output separately, like so
 `porter schema --debug 2> err.log`.
 
+## Breaking Changes
+
+Some changes in Porter break our compatibility with previous versions of Porter.
+When that happens, we need to release that change with a new major version number to indicate to users that it contains breaking changes.
+When you realize that you may need to make a breaking change, discuss it with a maintainer on the issue or pull request and we'll come up with a plan for how it should be released.
+Here are some examples of breaking changes:
+
+* The schema of porter.yaml changed.
+* The schema of Porter's [file formats](https://release-v1.porter.sh/reference/file-formats) changed.
+* The schema of Porter's [config file](https://release-v1.porter.sh/configuration/#config-file) changed.
+* Flags or behavior of a CLI command changed, such as removing a flag or adding a validation that can result in a hard error, preventing the command from running.
+
+All of Porter's documents have a schemaVersion field and when the schema of the document is changed, the version number should be incremented as well in the default set on new documents, the supported schema version constant in the code, and in the documentation for that document.
+
 # Infrastructure
 
 This section includes overviews of infrastructure Porter relies on, mostly intended

CONTRIBUTION_LADDER.md

@@ -10,7 +10,7 @@
   * [How to become an admin](#admin)
 ---
 
-Our ladder defines the roles and responsibilities on this project and how to
+Our ladder defines the roles and responsibilities for this project and how to
 participate with the goal of moving from a user to a maintainer. You will need
 to gain people's trust, demonstrate your competence and understanding, and meet
 the requirements of the role.

CONTRIBUTORS.md

@@ -62,3 +62,4 @@ and we will add you. **All** contributors belong here. 💯
 * [Mahendra Bishnoi](https://github.com/mahendrabishnoi2)
 * [Yingrong Zhao](https://github.com/VinozzZ)
 * [Chioma Onyekpere](https://github.com/Simpcyclassy)
+* [Saksham Sharma](https://github.com/sakkshm26)

Makefile

@@ -47,10 +47,6 @@ test-integration:
 test-smoke:
 	go run mage.go -v TestSmoke
 
-.PHONY: docs
-docs:
-	go run mage.go -v docs
-
 publish: publish-bin publish-mixins publish-images
 
 publish-bin:

README.md

@@ -92,7 +92,7 @@ open issues and pull requests.
 The roadmap represents what the maintainers have said that they are
 currently working on and plan to work on over the next few months. We use the
 "on-hold" bucket to communicate items of interest that do not have a
-maintainer who will be working on it.
+maintainer who will be working on them.
 
 <p align="center">Check out our <a href="https://porter.sh/roadmap">roadmap</a></p>
 

REVIEWING.md

@@ -13,10 +13,10 @@ Thank you for reviewing pull requests for us! 💖
 Here are the values and etiquette that we follow to ensure a welcoming, inclusive
 project that doesn't burn out our authors or our reviewers. 😅
 
-* We ask that authors respect reviewers time. Check out the
+* We ask that authors respect reviewers' time. Check out the
   [Contributing Guide](CONTRIBUTING.md) and know that you can ask the
-  author to do their part to make _your_ part managable.
-* We ask that reviewers respect authors time. Please do your best to review
+  author to do their part to make _your_ part manageable.
+* We ask that reviewers respect authors' time. Please do your best to review
   a pull request in a reasonable amount of time once you have assigned it to
   yourself.
 * The definition of "reasonable amount of time" is 3 business days. The ask is
@@ -38,9 +38,9 @@ project that doesn't burn out our authors or our reviewers. 😅
    For example, it is missing an agreed upon solution, requires an explanation
    from the author, has a very large set of changes that are not easy to review,
    etc., ask the author to correct that up-front.
-1. When you provide feedback, make it clear if the change must be made in order
+1. When you provide feedback, make it clear if the change must be made
    for the pull request to be approved, or if it is just a suggestion. Mark
-   suggestions with **nit**, for example `nit: I prefer that the bikeshed be
+   suggestions with **nit**, for example, `nit: I prefer that the bikeshed be
    blue`.
 1. When the pull request is ready to merge, squash the commits they require
    tidying unless the author asked to do that themselves.
@@ -71,7 +71,7 @@ reviewers.
 ## Giving feedback
 
 * Be kind. Here is [good article][kind-reviews] with example code reviews and 
-  how to improve your feedback. Giving feedback of this caliber is an requirement 
+  how to improve your feedback. Giving feedback of this caliber is a requirement 
   of maintainers and those who cannot do so will have the maintainer role revoked.
 * Request changes for bugs and program correctness.
 * Request changes to be consistent with existing precedent in the codebase.

build/azure-pipelines.integration.yml

@@ -12,7 +12,7 @@ pool:
   vmImage: "ubuntu-latest"
 
 variables:
-  GOVERSION: "1.17.6"
+  GOVERSION: "1.17.8"
 
 jobs:
   - job: integration_test

build/azure-pipelines.pr-automatic.yml

@@ -11,7 +11,7 @@ pool:
   vmImage: "ubuntu-latest"
 
 variables:
-  GOVERSION: "1.17.6"
+  GOVERSION: "1.17.8"
 
 parameters:
   - name: buildExamples

build/azure-pipelines.release-template.yml

@@ -4,7 +4,7 @@ variables: # these are really constants
 parameters:
   - name: goVersion
     type: string
-    default: "1.17.6"
+    default: "1.17.8"
   - name: registry
     type: string
     default: getporterci

build/images/agent/Dockerfile

@@ -6,6 +6,7 @@ FROM $REGISTRY/porter:$PORTER_VERSION
 VOLUME /porter-config
 
 ENV PORTER_HOME /app/.porter
-COPY --chown=65532:65532 bin/dev/agent-linux-amd64 /app/.porter/agent
+COPY --chown=65532:0 --chmod=770 bin/dev/agent-linux-amd64 /app/.porter/agent
 
+USER 65532
 ENTRYPOINT ["/app/.porter/agent"]

build/images/client/Dockerfile

@@ -11,10 +11,14 @@ COPY bin/mixins/exec/dev/exec-linux-amd64 mixins/exec/exec
 RUN ln -s /app/.porter/porter runtimes/porter-runtime && \
     ln -s /app/.porter/mixins/exec/exec mixins/exec/runtimes/exec-runtime
 
-# Copy the porter installation into a distroless container without root
-FROM gcr.io/distroless/static:nonroot
+# Copy the porter installation into a distroless container
+# Explicitly not using the nonroot tag because we don't want the user to exist so it is placed in the root group
+# This allows us to run with a random UID, and access a mounted docker socket (which is only accessible via the root group)
+FROM gcr.io/distroless/static
 WORKDIR /app
-COPY --from=builder --chown=65532:65532 /app/.porter /app/.porter
+COPY --from=builder --chown=65532:0 --chmod=770 /app/.porter /app/.porter
 ENV PATH "$PATH:/app/.porter"
 
+# Run as a nonroot user
+USER 65532
 ENTRYPOINT ["/app/.porter/porter"]