Merge branch 'main' into remove-survey

Author: sambhav

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Community Slack
-    url: https://slack.buildpacks.io/
+    url: https://slack.cncf.io
     about: Chat with the community about any issues, questions, or feedback

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v2
       - name: Setup Go environment
-        uses: actions/setup-go@v2.1.4
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: '1.x'
       - name: Install Dependencies
@@ -38,7 +38,7 @@ jobs:
         run: |
           make check-katacoda
       - name: Upload public folder
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.gitignore

@@ -19,6 +19,9 @@ $RECYCLE.BIN/
 # Generated files
 content/docs/tools/pack/cli/pack*
 
+# Hugo
+.hugo_build.lock
+
 # Tools
 /bin
 /tmp

.gitpod.yml

@@ -3,7 +3,10 @@ ports:
     onOpen: open-preview
 
 tasks:
-  - init: make build
+  - name: Setup
+    before: chmod ugo+w /var/run/docker.sock
+    init: make build
+    command: chmod ugo+w /var/run/docker.sock
 
 github:
   prebuilds:

README.md

@@ -11,7 +11,7 @@
 
 ### Calendar
 
-The calendar is managed via [teamup](https://teamup.com/ksxw26c3km72mq3imn). To request an alteration you may [create an issue](https://github.com/buildpacks/community/issues/new), reach out to a maintainer via [slack](https://slack.buildpacks.io), post in [discussions](https://github.com/buildpacks/community/discussions).
+The calendar is managed via [teamup](https://teamup.com/ksxw26c3km72mq3imn). To request an alteration you may [create an issue](https://github.com/buildpacks/community/issues/new), reach out to a maintainer via [slack](https://slack.cncf.io) in #buildpacks-maintainers, post in [discussions](https://github.com/buildpacks/community/discussions).
 
 ## Contributing
 

config.toml

@@ -13,7 +13,7 @@ unsafe= true
 [params]
 twitter_handle = "buildpacks_io"
 github_base_url = "https://github.com/buildpacks"
-slack_invite_url = "https://slack.buildpacks.io/"
+slack_invite_url = "https://slack.cncf.io"
 description = "Cloud Native Buildpacks transform your application source code into images that can run on any cloud."
 
 pack_version_env_var = "PACK_VERSION"
@@ -66,7 +66,7 @@ pack_version_env_var = "PACK_VERSION"
 
   [[menu.footer2]]
   name       = "Slack"
-  url        = "https://slack.buildpacks.io/"
+  url        = "https://slack.cncf.io"
   weight     = 2
 
   [[menu.footer2]]
@@ -78,3 +78,14 @@ pack_version_env_var = "PACK_VERSION"
   name       = "GitHub"
   url        = "https://github.com/buildpacks"
   weight     = 4
+
+[security]
+  enableInlineShortcodes = false
+  [security.exec]
+    allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$']
+    osEnv = ['(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$']
+  [security.funcs]
+    getenv = ['^HUGO_', 'PACK_VERSION']
+  [security.http]
+    methods = ['(?i)GET|POST']
+    urls = ['.*']

content/community.md

@@ -51,9 +51,9 @@ Some examples where we'd value documentation contributions are:
   - [libcnb](https://github.com/buildpacks/libcnb)
   - [lifecycle](https://github.com/buildpacks/lifecycle)
   - [pack](https://github.com/buildpacks/pack)
-- Writing posts for our [Medium blog](https://medium.com/buildpacks). Please discuss blog proposals with the [learning team on Slack](https://buildpacks.slack.com/archives/CST4A3ECV).
+- Writing posts for our [Medium blog](https://medium.com/buildpacks). Please discuss blog proposals with the [learning team on Slack, #buildpacks-learning-team](https://cloud-native.slack.com/app_redirect?channel=buildpacks-learning-team).
 
-If you have any other ideas where documentation would be useful, please feel free to open up an issue in the related repository, or drop a message at the [#docs channel on Slack!](https://buildpacks.slack.com/archives/CDLN5A3TL)
+If you have any other ideas where documentation would be useful, please feel free to open up an issue in the related repository, or drop a message at the [#buildpacks-learning-team channel on Slack!](https://cloud-native.slack.com/app_redirect?channel=buildpacks-learning-team)
 
 {{< /tab >}}
 

content/docs/_index.md

@@ -50,7 +50,7 @@ Cloud Native Buildpacks is an incubating project in the CNCF. We welcome contrib
 
 ## Community
 
-The best place to contact the Cloud Native Buildpack team is on our [Slack channel](https://slack.buildpacks.io/) or [mailing list](https://lists.cncf.io/g/cncf-buildpacks).
+The best place to contact the Cloud Native Buildpack team is on the [CNCF Slack](https://slack.cncf.io/) in the #buildpacks or [mailing list](https://lists.cncf.io/g/cncf-buildpacks).
 
 ## Contributor's Guide
 

content/docs/app-developer-guide/building-on-podman.md

@@ -0,0 +1,105 @@
++++
+title="Building on Podman"
+weight=99
+summary="Use podman as an alternative to Docker with Cloud Native Buildpacks."
+aliases=[
+    "/docs/using-pack/building-app/"
+]
++++
+
+### What is Podman?
+
+To quote from the official documentation:
+
+> Podman is a daemonless, open source, Linux native tool designed to make it easy to find, run, build, share and deploy applications using Open Containers Initiative (OCI) Containers and Container Images.
+
+It can be used as a standalone daemonless CLI with sub-commands and flags almost identical the standard `docker` CLI. You can even alias `docker=podman` and everything should work as expected.
+
+Beside running as a standalone daemonless CLI, `podman` can also serve as a `docker` API daemon using `podman system service` sub-command. You just need to set the `DOCKER_HOST` environment and most applications will pick it up (`pack` is one of them).
+
+While `podman` is native to Linux you still can enjoy it on `macOS` using virtual machine. There is sub-command `podman machine` facilitating VM creation making it really easy.
+
+# Setup
+
+Minimal required versions:
+
+  * `podman v3.3.0` or newer
+  * [`pack v0.22.0`](/docs/tools/pack/) or newer
+
+---
+
+{{< podman-setup >}}
+
+# Usage
+
+## Build
+
+### Source
+
+![](https://i.imgur.com/JVr0uue.png)
+
+```shell=bash
+git clone https://github.com/buildpacks/samples
+```
+
+### `pack build`
+
+![](https://i.imgur.com/0mmV6K7.png)
+
+```shell=bash
+pack build sample-app -p samples/apps/ruby-bundler/ -B cnbs/sample-builder:bionic
+```
+
+Where:
+  - `sample-app` is the image name of the image to be created.
+  - `-p` is the **path** to the application source.
+  - `-B` is the **[builder][builder]** to use.
+
+> **NOTE**: If using a _socket_ connection, for example on Linux, you'll need to pass an additional flag in order to provide the proper socket location to the `lifecycle`: `--docker-host=inherit`
+> <br/><br/>
+> In the future, this may be [automatically detected](https://github.com/buildpacks/pack/issues/1338).
+
+### Results
+
+![](https://i.imgur.com/D0Wwm9Z.png)
+
+```shell=bash
+podman images
+```
+
+[builder]: https://buildpacks.io/docs/concepts/components/builder/
+
+---
+
+# Known Issues & Limitations
+
+  * On `macOS` bind mounts do not work since the VM cannot access host file system.
+  * With more time consuming builds and `--trust-builder=true` following error may occur:
+    ```
+    ERROR: failed to image: error during connect: Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.40/info": EOF
+    ```
+    There is a workaround for this, increase timeout of podman service:
+    ```shell=bash
+    cat <<EOF > /etc/systemd/user/podman.service
+    [Unit]
+    Description=Podman API Service
+    Requires=podman.socket
+    After=podman.socket
+    Documentation=man:podman-system-service(1)
+    StartLimitIntervalSec=0
+
+    [Service]
+    Type=exec
+    KillMode=process
+    Environment=LOGGING="--log-level=info"
+    ExecStart=/usr/bin/podman $LOGGING system service --time=1800
+
+    [Install]
+    WantedBy=multi-user.target
+    EOF
+    
+    systemctl --user daemon-reload
+    systemctl restart --user podman.socket
+    ```
+
+    On `macOS` you need to run this in the VM (use `podman machine ssh`).

content/docs/app-developer-guide/using-cache-image.md

@@ -19,7 +19,7 @@ The `--cache-image` parameter must be in the following format
 --cache-image <remote-image-location>
 ```
 
-The `--cache-images` flag must be specified in conjunction with the `--publish` flag.
+The `--cache-image` flag must be specified in conjunction with the `--publish` flag.
 
 ### Examples
 For the following examples we will use:
@@ -85,4 +85,4 @@ pack build localhost:5000/buildpack-examples/second-cache-image-example \
 ```
 <!--+- "{{execute}}"+-->
 
-[samples]: https://github.com/buildpack/samples
+[samples]: https://github.com/buildpack/samples