Merge branch 'master' into feature/change-password

.github/workflows/on-push.yml

@@ -0,0 +1,41 @@
+name: Docker build on master
+env:
+        DOCKER_CLI_EXPERIMENTAL: enabled
+
+on:
+        push:
+                branches:
+                  - master
+
+jobs:
+        build:
+                runs-on: ubuntu-18.04
+                name: Build and push dashboard image
+                steps:                                
+                        - name: Login to Docker Hub
+                          run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+                        - name: Checkout project
+                          uses: actions/checkout@v2
+                        - name: Setup Docker buildx action
+                          uses: crazy-max/ghaction-docker-buildx@v1
+                          id: buildx
+                          with:
+                                  buildx-version: latest
+                                  qemu-version: latest
+                        - name: Show available buildx platforms
+                          run: echo ${{ steps.buildx.outputs.platforms }}
+                        - name: Run Docker buildx
+                          run: |
+                                  docker buildx build \
+                                  --platform linux/amd64,linux/arm/v7 \
+                                  -t ${{ secrets.DOCKER_HUB_USER }}/dashboard:master \
+                                  --output "type=registry" \
+                                  .
+                        - name: Run Docker buildx against stage
+                          run: |
+                                docker buildx build \
+                                --platform linux/amd64 \
+                                -f ./Dockerfile.stage \
+                                -t ${{ secrets.DOCKER_HUB_USER }}/dashboard:stage-master \
+                                --output "type=registry" \
+                                .

.github/workflows/on-tag.yml

@@ -1,4 +1,4 @@
-name: Automatically Build image on tag
+name: Docker build on tag
 env:
         DOCKER_CLI_EXPERIMENTAL: enabled
 
@@ -11,44 +11,44 @@ on:
 jobs:
         build:
                 runs-on: ubuntu-18.04
-                name: Build / Push Umbrel Dashboard on version tag
+                name: Build and push dashboard image
                 steps:
-                        - name: Setup Environment
+                        - name: Set env variables
                           run: echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//}
-                        - name: Show set environment variables
+                        - name: Show set env variables
                           run: |
                                   printf "    TAG: %s\n"  "$TAG"                                  
-                        - name: Login to Docker for building
+                        - name: Login to Docker Hub
                           run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
                         - name: Checkout project
                           uses: actions/checkout@v2
-                        - name: Setup Docker buildx Action
+                        - name: Setup Docker buildx action
                           uses: crazy-max/ghaction-docker-buildx@v1
                           id: buildx
                           with:
                                   buildx-version: latest
                                   qemu-version: latest
-                        - name: Available platforms
+                        - name: Show available buildx platforms
                           run: echo ${{ steps.buildx.outputs.platforms }}
-                        - name: Run Docker build X (against tag)
+                        - name: Run Docker buildx against tag
                           run: |
                                   docker buildx build \
-                                  --platform linux/amd64,linux/arm/v7,linux/arm64 \
-                                  -t getumbrel/dashboard:$TAG \
+                                  --platform linux/amd64,linux/arm/v7 \
+                                  -t ${{ secrets.DOCKER_HUB_USER }}/dashboard:$TAG \
                                   --output "type=registry" \
                                   .
-                        - name: Run Docker build X (against latest)
+                        - name: Run Docker buildx against latest
                           run: |
                                   docker buildx build \
-                                  --platform linux/amd64,linux/arm/v7,linux/arm64 \
-                                  -t getumbrel/dashboard:latest \
+                                  --platform linux/amd64,linux/arm/v7 \
+                                  -t ${{ secrets.DOCKER_HUB_USER }}/dashboard:latest \
                                   --output "type=registry" \
                                   .
-                        - name: Run Docker buildx (against stage)
+                        - name: Run Docker buildx against stage
                           run: |
                                 docker buildx build \
                                 --platform linux/amd64 \
                                 -f ./Dockerfile.stage \
-                                -t getumbrel/dashboard:stage \
+                                -t ${{ secrets.DOCKER_HUB_USER }}/dashboard:stage \
                                 --output "type=registry" \
                                 .