Merge branch 'develop'

HeliumEdu · Oct 17, 2024 · 09e50e0 · 09e50e0
2 parents d858ec6 + 951532c
commit 09e50e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,11 +22,11 @@ jobs:
         with:
           node-version: 18
       - name: Install dependencies
-        run:
-          make install build
+        run: make install build
       - name: Test frontend
-        run:
-          make test
+        run: make test
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Test Docker build
         run: make build-docker
       - name: Upload coverage

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ test:
 	@npm run test
 
 build-docker:
-	docker build -t helium/frontend:latest -t helium/frontend:$(TAG_VERSION) .
+	docker buildx build --platform=linux/arm64 -t helium/frontend:latest -t helium/frontend:$(TAG_VERSION) .
 
 run-docker:
 	docker compose up -d