From 98563728df4c8fd821e09bb16d56373d3079ae83 Mon Sep 17 00:00:00 2001
From: bschilder <brian_schilder@alumni.brown.edu>
Date: Thu, 12 Oct 2023 03:03:59 +0100
Subject: [PATCH] Try docker/setup-buildx-action@v2

---
 action.yml                | 9 +++------
 inst/templates/Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/action.yml b/action.yml
index 97f512d7..97a00434 100644
--- a/action.yml
+++ b/action.yml
@@ -485,10 +485,7 @@ runs:
     - name: 🐳🛠 Set up Docker Buildx
       if: |
         (!contains(github.event.head_commit.message, '[nodocker]')) && inputs.run_docker == 'true' && runner.os == 'Linux'
-      uses: docker/setup-buildx-action@v3
-      with:
-        install: true
-        use: false
+      uses: docker/setup-buildx-action@v2
         
     # - name: 🐳🛠 Set up QEMU
     #   if: |
@@ -511,7 +508,7 @@ runs:
       with:
         registry: ghcr.io
         username: ${{ inputs.docker_user }}
-        password: ${{ inputs.DOCKER_TOKEN }} 
+        password: ${{ inputs.DOCKER_TOKEN }}  
       
     - name: 🐳✏️ Create Docker file 
       if: |
@@ -533,4 +530,4 @@ runs:
           ${{ inputs.docker_registry }}/${{ inputs.docker_org }}/${{ env.packageName }}:latest
         build_args: |
           PKG=${{ env.packageNameOrig }},
-          CONT=${{ matrix.config.cont }}
+          BASE_IMAGE=${{ matrix.config.cont }}
diff --git a/inst/templates/Dockerfile b/inst/templates/Dockerfile
index 2a003882..966e6855 100644
--- a/inst/templates/Dockerfile
+++ b/inst/templates/Dockerfile
@@ -18,7 +18,7 @@
 # and you can set the password to whatever you like,
 #
 # This DockerFile was partly adapted from the [scFlow Dockerfile](https://github.com/combiz/scFlow/blob/master/Dockerfile).
-FROM $CONT
+FROM $BASE_IMAGE
 RUN apt-get update && \
     apt-get install -y \
     git-core \