diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml index bba6a6dc..d1e04a39 100644 --- a/.github/workflows/latest.yml +++ b/.github/workflows/latest.yml @@ -3,12 +3,13 @@ on: push: branches: - main + - multiarch jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 - run: npm install -g dockerlint - run: dockerlint build: @@ -20,4 +21,6 @@ jobs: - uses: docker/setup-buildx-action@v3 - uses: docker/build-push-action@v5 with: - platforms: linux/amd64 + platforms: | + linux/amd64 + linux/arm64 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index fcc37bac..ad4b1b2b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,8 +7,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 - run: npm install -g dockerlint - run: dockerlint build-push: @@ -30,7 +30,9 @@ jobs: echo "tags=$tags" >> "$GITHUB_OUTPUT" - uses: docker/build-push-action@v5 with: - platforms: linux/amd64 + platforms: | + linux/amd64 + linux/arm64 push: true tags: | ${{ steps.meta.outputs.tags }} diff --git a/Makefile b/Makefile index 8fecf993..241e121a 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +ARCH := linux/arm64 REPO := amancevice/superset PYTHON_VERSION := $(shell cat .python-version) SUPERSET_VERSION := $(shell grep apache-superset Pipfile | grep -Eo '[0-9.]+') @@ -5,7 +6,7 @@ SUPERSET_VERSION := $(shell grep apache-superset Pipfile | grep -Eo '[0-9.]+') build: requirements-dev.txt docker buildx build \ --build-arg PYTHON_VERSION=$(PYTHON_VERSION) \ - --platform linux/amd64 \ + --platform $(ARCH) \ --tag $(REPO) \ --tag $(REPO):$(SUPERSET_VERSION) \ .