Merge pull request #20 from abkfenris/dependabot

Use Buildx in Github Actions

Author: kwilcox

.github/workflows/push.yml

@@ -1,6 +1,9 @@
 name: Push
 
-on: [push, workflow_dispatch]
+on: [push, workflow_dispatch, pull_request]
+env:
+  BUILDX_CACHE: /tmp/.buildx-cache
+  CACHE_KEY: docker-erddap-buildx-
 
 jobs:
   build:
@@ -12,19 +15,32 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v1
 
-    - name: Cache Docker Layers
-      uses: satackey/action-docker-layer-caching@v0.0.11
-      continue-on-error: true
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: ${ BUILDX_CACHE }
+        key: ${ CACHE_KEY }${{ github.sha }}
+        restore-keys: |
+          ${ CACHE_KEY }
     
     - name: Login to Docker Hub
-      uses: azure/docker-login@v1
+      uses: docker/login-action@v1
       continue-on-error: true
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-    
-    - name: Build Docker Image
-      run: docker build --tag axiom/docker-erddap:latest .
+
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        push: false
+        tags: axiom/docker-erddap:latest
+        cache-from: type=local,src=${ BUILDX_CACHE }
+        cache-to: type=local,dest=${ BUILDX_CACHE }
+        outputs: type=docker
 
     - name: Run Docker Image in Background
       run: docker run -d -p 8080:8080 axiom/docker-erddap:latest
@@ -46,14 +62,27 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v1
 
-    - name: Cache Docker Layers
-      uses: satackey/action-docker-layer-caching@v0.0.11
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: ${ BUILDX_CACHE }
+        key: ${ CACHE_KEY }${{ github.sha }}
+        restore-keys: |
+          ${ CACHE_KEY }
     
     - name: Login to Docker Hub
-      uses: azure/docker-login@v1
+      uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     - name: Push latest image to Docker Hub if on master or main branch of Axiom's repo
-      run: docker push axiom/docker-erddap:latest
+      uses: docker/build-push-action@v2
+      with:
+        push: true
+        tags: axiom/docker-erddap:latest
+        cache-from: type=local,src=${ BUILDX_CACHE }
+        cache-to: type=local,dest=${ BUILDX_CACHE }