Merge branch 'main' into main

Author: jromero

.editorconfig

@@ -1,3 +1,7 @@
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+indent_size = 4

.github/PR_TEMPLATE.md

@@ -0,0 +1,30 @@
+## Summary
+<!-- Provide a high-level summary of the change. -->
+This PR fixes #
+
+## Output
+<!-- If applicable, please provide examples of the output changes. -->
+
+#### Before
+
+#### After
+
+
+**Notes for Reviewers**
+
+
+**[Signed commits](https://github.com/buildpacks/.github/blob/main/CONTRIBUTING.md#sign-off-process)**
+- [ ] Yes, I signed my commits.
+ 
+
+<!--
+Thank you for contributing to Cloud Native Buildpacks! 
+
+Contributing Conventions:
+
+1. Run `make prepare-for-pr` before submitting a PR. 
+2. Sign your commits
+
+By following the community's contribution conventions upfront, the review process will 
+be accelerated and your PR merged more quickly.
+-->

.github/bug_report.md

@@ -0,0 +1,27 @@
+### **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 or screen captures to help explain your problem.
+
+### **Additional context**
+Add any other context about the problem here.
+
+<hr/>
+
+<!--- Do not remove or change this in the issue description. Only update the details above this. --->
+**Note:**
+* If you want to work on an issue, you should check if it has already been assigned to anyone. **If the issue is free** and you would like to be assigned to it please comment on the issue.
+* If you are raising a new issue and want to work on it then also you should comment to get assigned.
+* Please **refrain from** adding labels to your issue/pull-request on your own. It is the job of the Project Admin and the Mentors to review your issue/pull-request and add labels accordingly.
+

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  # Set update schedule for gomod
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"
+
+  # Set update schedule for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v2
       - name: Setup Go environment
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           go-version: '1.x'
       - name: Install Dependencies
@@ -35,7 +35,7 @@ jobs:
         run: |
           make check-links
       - name: Upload public folder
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2.2.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -48,13 +48,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download public folder
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2.0.10
         with:
           name: public
+          path: ./public
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public
           cname: buildpacks.io
-          full_commit_message: ${{ github.event.head_commit.message }}
+          full_commit_message: ${{ github.event.head_commit.message }}

.gitignore

@@ -22,3 +22,5 @@ content/docs/tools/pack/cli/pack*
 # Tools
 /bin
 /tmp
+
+/tools/bin

DEVELOPMENT.md

@@ -5,9 +5,11 @@
 * [jq](https://stedolan.github.io/jq/)
     * macOS: `brew install jq`
     * Windows: `choco install jq`
+    * Ubuntu: `sudo apt install jq`
 * Make
     * macOS: `xcode-select --install`
     * Windows: `choco install make`
+    * Ubuntu: `sudo apt install make`
 
 #### Serve
 
@@ -22,3 +24,9 @@ make serve
 ```bash
 make build
 ```
+
+#### Clean
+
+```bash
+make clean
+```

Makefile

@@ -11,25 +11,63 @@ BASE_URL=$(shell echo "$(GITPOD_WORKSPACE_URL)" | sed -r 's;^([^/]*)//(.*);\1//$
 endif
 endif
 
-ifndef PACK_VERSION
+GITHUB_API_OPTS:=
 ifdef GITHUB_TOKEN
-PACK_VERSION:=$(shell curl -s -H "Authorization: token $(GITHUB_TOKEN)" https://api.github.com/repos/buildpacks/pack/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')
-else
-PACK_VERSION:=$(shell curl -s https://api.github.com/repos/buildpacks/pack/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')
+GITHUB_API_OPTS+=-H "Authorization: token $(GITHUB_TOKEN)"
 endif
+
+ifndef PACK_VERSION
+PACK_VERSION:=$(shell curl -sSL $(GITHUB_API_OPTS) https://api.github.com/repos/buildpacks/pack/releases/latest | jq -r '.tag_name' | sed -e 's/^v//')
 endif
 
 .PHONY: default
 default: serve
 
 .PHONY: clean
 clean:
-	rm -rf ./public ./resources
+	rm -rf ./public ./resources $(TOOLS_BIN)
+
+TOOLS_BIN:=tools/bin
+$(TOOLS_BIN):
+	mkdir $(TOOLS_BIN)
+
+# adapted from https://stackoverflow.com/a/12099167/552902
+HUGO_OS:=Linux
+HUGO_ARCH:=32bit
+HUGO_EXT:=tar.gz
+ifeq ($(OS),Windows_NT)
+	HUGO_OS:=Windows
+	HUGO_EXT:=zip
+ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
+	HUGO_ARCH:=64bit
+endif
+else
+ifeq ($(shell uname -s),Darwin)
+	HUGO_OS:=macOS
+endif
+UNAME_P:=$(shell uname -p)
+ifneq ($(filter %64,$(UNAME_P)),)
+	HUGO_ARCH:=64bit
+endif
+ifneq ($(filter arm%,$(UNAME_P)),)
+	HUGO_ARCH:=ARM64
+endif
+endif
 
-.PHONY: install-hugo
-install-hugo:
-	@echo "> Installing hugo..."
-	cd tools; go install -mod=mod --tags extended github.com/gohugoio/hugo
+HUGO_RELEASES_CACHE:=tools/bin/hugo-releases
+$(HUGO_RELEASES_CACHE): | $(TOOLS_BIN)
+	curl -sSL $(GITHUB_API_OPTS) https://api.github.com/repos/gohugoio/hugo/releases/latest > $(HUGO_RELEASES_CACHE)
+
+HUGO_BIN:=tools/bin/hugo
+$(HUGO_BIN): $(HUGO_RELEASES_CACHE)
+$(HUGO_BIN):
+	@echo "> Installing hugo for $(HUGO_OS) ($(HUGO_ARCH))..."
+	curl -sSL -o $(HUGO_BIN).$(HUGO_EXT) $(shell cat $(HUGO_RELEASES_CACHE) | jq -r '[.assets[] | select (.name | test("extended.*$(HUGO_OS)-$(HUGO_ARCH).*$(HUGO_EXT)"))][0] | .browser_download_url')
+ifeq ($(HUGO_EXT), zip)
+	unzip $(HUGO_BIN).$(HUGO_EXT) -d $(TOOLS_BIN)
+else
+	tar mxfz $(HUGO_BIN).$(HUGO_EXT) -C $(TOOLS_BIN) hugo
+endif
 
 .PHONY: upgrade-pack
 upgrade-pack: pack-version
@@ -53,9 +91,9 @@ install-ugo:
 .PHONY: pack-docs-update
 pack-docs-update: upgrade-pack
 	@echo "> Updating Pack CLI Documentation"
-	@echo "> SHA of contents (before update):" `find ./content/docs/tools/pack -type f -print0  | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`
+	@echo "> SHA of contents (before update):" `find ./content/docs/tools/pack -type f -print0 | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`
 	cd tools; go run -mod=mod get_pack_commands.go
-	@echo "> SHA of contents (after update):" `find ./content/docs/tools/pack -type f -print0  | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`
+	@echo "> SHA of contents (after update):" `find ./content/docs/tools/pack -type f -print0 | xargs -0 sha1sum | sha1sum | cut -d' ' -f1`
 
 .PHONY: pack-version
 pack-version: export PACK_VERSION:=$(PACK_VERSION)
@@ -67,19 +105,19 @@ pack-version:
 
 .PHONY: serve
 serve: export PACK_VERSION:=$(PACK_VERSION)
-serve: install-hugo pack-version pack-docs-update
+serve: $(HUGO_BIN) pack-version pack-docs-update
 	@echo "> Serving..."
 ifeq ($(BASE_URL),)
-	hugo server --disableFastRender --port=$(SERVE_PORT)
+	$(HUGO_BIN) server --disableFastRender --port=$(SERVE_PORT)
 else
-	hugo server --disableFastRender --port=$(SERVE_PORT) --baseURL=$(BASE_URL) --appendPort=false
+	$(HUGO_BIN) server --disableFastRender --port=$(SERVE_PORT) --baseURL=$(BASE_URL) --appendPort=false
 endif
 
 .PHONY: build
 build: export PACK_VERSION:=$(PACK_VERSION)
-build: install-hugo pack-version pack-docs-update
+build: $(HUGO_BIN) pack-version pack-docs-update
 	@echo "> Building..."
-	hugo
+	$(HUGO_BIN)
 
 .PHONY: test
 test: install-pack-cli install-ugo

content/docs/app-developer-guide/build-a-windows-app.md

@@ -6,7 +6,7 @@ summary="The basics of taking your Windows app from source code to runnable imag
 
 > **EXPERIMENTAL:**
 >
-> - Please note that **Windows container support is currently experimental**. You may be asked to enable experimental features  in `pack` when running the following commands. Simply follow the on-screen instructions to do so.
+> - Please note that **Windows container support is currently experimental**. You may be asked to enable experimental features in `pack` when running the following commands. Simply follow the on-screen instructions to do so.
 > - If you encounter any problems while experimenting, we'd love for you to let us know by filing an issue on the [pack][pack-issues] or [lifecycle][lifecycle-issues] repo.
 
 ### Recommended reading

content/docs/app-developer-guide/build-an-app.md

@@ -55,6 +55,12 @@ docker run --rm -p 8080:8080 sample-app
 
 The app should now be running and accessible via [localhost:8080](http://localhost:8080).
 
+## What about ARM apps?
+
+Linux ARM image builds are now supported!
+
+<a href="/docs/app-developer-guide/build-an-arm-app" class="button bg-blue">Linux ARM build guide</a>
+
 ## What about Windows apps?
 
 Windows image builds are now supported!