From b897a26f42e13ff9eed6a108f5eda1b6d9f8e78c Mon Sep 17 00:00:00 2001
From: Fernando De Lucchi <69133647+fdelucchijr@users.noreply.github.com>
Date: Sat, 13 Nov 2021 21:08:59 -0500
Subject: [PATCH 1/3] arm64 docker image build in release process

---
 .github/workflows/release.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c0605f1..275c5b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,6 +40,20 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      
+      - name: Set up QEMU for multiple platforms
+        uses: docker/setup-qemu-action@master
+        with:
+          platforms: arm64,amd64
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
@@ -53,17 +67,20 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
+            
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+          
       - name: Login to GHCR
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
@@ -72,3 +89,11 @@ jobs:
           context: .
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+
+      - name: Prepare cache for next build
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

From f74b9f5fe27b2b22f05a5945b77e47300ee4a746 Mon Sep 17 00:00:00 2001
From: Fernando De Lucchi <69133647+fdelucchijr@users.noreply.github.com>
Date: Wed, 17 Nov 2021 16:25:37 -0500
Subject: [PATCH 2/3] Styling and prettier

---
 .github/workflows/release.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index be83a0e..06bd3cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,12 +40,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      
       - name: Set up QEMU for multiple platforms
         uses: docker/setup-qemu-action@master
         with:
           platforms: arm64,amd64
-
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
@@ -53,7 +51,6 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
@@ -67,20 +64,17 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
-            
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          
       - name: Login to GHCR
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
@@ -92,13 +86,11 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
-
       - name: Prepare cache for next build
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-
   docker-debug-release:
     runs-on: ubuntu-latest
     steps:
@@ -110,7 +102,6 @@ jobs:
         uses: docker/setup-qemu-action@master
         with:
           platforms: arm64,amd64
-
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:
@@ -118,7 +109,6 @@ jobs:
           key: ${{ runner.os }}-buildx-debug-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-debug-
-
       - name: Docker meta
         id: meta-debug
         uses: docker/metadata-action@v3
@@ -161,4 +151,4 @@ jobs:
       - name: Prepare cache for next build
         run: |
           rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-debug-new /tmp/.buildx-cache-debug
\ No newline at end of file
+          mv /tmp/.buildx-cache-debug-new /tmp/.buildx-cache-debug

From e91f72fe4c9cf747605cbbd64f89b5016be35c00 Mon Sep 17 00:00:00 2001
From: lion24 <lionel_dell24@hotmail.be>
Date: Sat, 20 Nov 2021 23:31:49 +0100
Subject: [PATCH 3/3] Running.md: fix missing backslash (\)

* This would cause otherwise the command to abort after the first statement of the docker command ;)
---
 docs/Running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Running.md b/docs/Running.md
index 867c5ed..ac9d228 100644
--- a/docs/Running.md
+++ b/docs/Running.md
@@ -26,7 +26,7 @@
 
    ```shell
    docker run --name headscale \
-     -e POSTGRES_DB=headscale
+     -e POSTGRES_DB=headscale \
      -e POSTGRES_USER=foo \
      -e POSTGRES_PASSWORD=bar \
      -p 5432:5432 \