Skip to content

Commit fd43b3a

Browse files
authored
Merge pull request #274 from lukyer/master
ARM support
2 parents 32ddbd1 + 1829d84 commit fd43b3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY Makefile main.go ./
99
COPY server/ ./server/
1010
RUN make VERSION=$VERSION COMMIT=$COMMIT RELEASE=1 build
1111

12-
FROM node:16-alpine AS build-frontend
12+
FROM node:16-bullseye AS build-frontend
1313
WORKDIR /wd
1414
ENV PARCEL_WORKERS 1
1515
# node-gyp dependencies: https://github.com/nodejs/node-gyp#on-unix

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ clean:
108108

109109
.PHONY: build-docker
110110
build-docker:
111-
docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):latest .
111+
docker buildx build --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):latest --platform linux/arm64,linux/amd64 .
112112
docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE):$(DOCKER_TAG)
113113

114114
.PHONY: start-docker

0 commit comments

Comments
 (0)