Skip to content

Commit

Permalink
conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ferrell-code committed Jun 15, 2022
2 parents 9769156 + 4f70efc commit feb3f6a
Show file tree
Hide file tree
Showing 93 changed files with 2,059 additions and 1,827 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -47,10 +49,14 @@ jobs:
type=ref,event=branch
type=ref,event=pr
type=sha
- name: Change Dockerfile to support multi-platform
run: |
sed -i 's/FROM /FROM --platform=$BUILDPLATFORM /g' scripts/Dockerfile
- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
Loading

0 comments on commit feb3f6a

Please sign in to comment.