Skip to content

Commit

Permalink
Try docker/setup-buildx-action@v2
Browse files Browse the repository at this point in the history
  • Loading branch information
bschilder committed Oct 12, 2023
1 parent 1ba91e8 commit 9856372
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 3 additions & 6 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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: |
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion inst/templates/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 9856372

Please sign in to comment.