Merge branch 'main' into dependabot/go_modules/tools/github.com/docker/docker-25.0.5incompatible

Author: AidanDelaney

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Dependencies
         run: sudo apt-get install make curl jq
       - name: Install pack
-        uses: buildpacks/github-actions/setup-pack@v5.5.3
+        uses: buildpacks/github-actions/setup-pack@v5.5.4
         with:
           pack-version: '0.31.0'
       - name: Test

content/docs/app-journey.md

@@ -8,12 +8,13 @@ getting-started=true
 
 In this tutorial, we'll explain how to use `pack` and **buildpacks** to create a runnable app image from source code.
 
-In order to run the build process in an isolated fashion, `pack` uses **Docker**. That means you'll need to make sure you have both `docker` and `pack` installed:
-
-{{< download-button href="https://store.docker.com/search?type=edition&offering=community" color="blue" >}} Install Docker {{</>}}
+In order to run the build process in an isolated fashion, `pack` uses **Docker** or a Docker-compatible daemon to create the containers where buildpacks execute.
+That means you'll need to make sure you have both `pack` and a daemon installed:
 
 {{< download-button href="/docs/install-pack" color="pink" >}} Install pack {{</>}}
 
+{{< download-button href="https://store.docker.com/search?type=edition&offering=community" color="blue" >}} Install Docker {{</>}} or alternatively, see [this page](/docs/for-app-developers/how-to/special-cases/build-on-podman) about working with `podman`.
+
 > **NOTE:** `pack` is only one implementation of the [Cloud Native Buildpacks Platform Specification][cnb-platform-spec]. Additionally, not all Cloud Native Buildpacks Platforms require Docker.
 
 [cnb-platform-spec]: https://github.com/buildpacks/spec/blob/main/platform.md

content/docs/for-app-developers/how-to/build-inputs/specify-export-target.md

@@ -7,13 +7,13 @@ Tell `pack` where you want your application image to be saved.
 
 <!--more-->
 
-By default, when you `pack build` an application, the image will be saved to a daemon, such as Docker or [Podman][podman],
+By default, when you build an application with `pack build <my-image>`, the image will be saved to a daemon, such as Docker or [Podman][podman],
 and you can view the image using a command such as `docker image ls`.
 
 However, you could also choose to "publish" the application to an OCI registry, such as Docker Hub or Google Artifact Registry,
 or even to a local registry, by providing the `pack build --publish` flag.
 
-Or, you could save the image in OCI layout format on disk by providing the `--layout` flag.
+Or, you could save the image in OCI layout format on disk by prefixing your image name with `oci:`, as in `pack build oci:<my-image>`.
 See [here][OCI layout] for more information about working with layout images.
 
 ## FAQ: What am I using the daemon for?

content/docs/for-app-developers/how-to/special-cases/_index.md

@@ -1,6 +1,5 @@
 +++
 title="Build in custom environments"
 weight=3
-
 include_summaries=true
 +++

content/docs/for-app-developers/how-to/special-cases/build-for-windows.md

@@ -7,6 +7,11 @@ aliases=[
 weight=2
 +++
 
+You can use buildpacks to build container images that run Windows containers on Windows (WCOW).
+
+This page is not relevant if your host machine is Windows but you are running Linux containers on Windows (LCOW);
+in this case, no special configuration is required.
+
 <!--more-->
 
 > **EXPERIMENTAL** Windows support is experimental!

content/docs/for-app-developers/how-to/special-cases/export-to-oci-layout.md

@@ -5,6 +5,7 @@ aliases=[
   "/docs/features/experimental/export-to-oci-layout"
 ]
 weight=3
+summary="The OCI Image Layout is the directory structure for OCI content-addressable blobs and location-addressable references."
 +++
 
 <!--more-->

content/docs/for-buildpack-authors/tutorials/basic-buildpack/01_setup-local-environment.md

@@ -68,7 +68,7 @@ We also create a `package.json` file with the following contents:
 <!-- test:file=node-js-sample-app/package.json -->
 ```javascript
 {
-  name = "example-application"
+  "name": "example-application"
 }
 ```
 

themes/buildpacks/layouts/index.html

@@ -90,7 +90,18 @@ <h3 class="mb-0">Maintainability</h3>
     <a href="/features">See list of features</a>
   </div>
 
-  <h2>About the Project</h2>
+  <h2>What We Do</h2>
+  <section class="row">
+    <div class="col-sm">
+      <p>Cloud Native Buildpacks (CNBs) transform your application source code into container images that can run on any
+        cloud. With buildpacks, organizations can concentrate the knowledge of container build best practices within a
+        specialized team, instead of having application developers across the organization individually maintain their
+        own Dockerfiles. This makes it easier to know what is inside application images, enforce security and compliance
+        requirements, and perform upgrades with minimal effort and intervention.</p>
+    </div>
+  </section>
+
+  <h2>Our Origin Story</h2>
   <section class="row">
     <div class="col-sm">
       <p><strong>Buildpacks</strong> were first conceived by Heroku in 2011. Since then, they have been adopted by Cloud
@@ -110,8 +121,8 @@ <h2>About the Project</h2>
       <p>Cloud Native Buildpacks embrace modern container standards, such as the OCI image format. They take advantage
         of the latest capabilities of these standards, such as cross-repository blob mounting and image layer "rebasing"
         on Docker API v2 registries.</p>
-    </div>
-  </section>
+      </div>
+    </section>
 </div>
 
 <div id="get-started" class="container">