ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client+server/docker: fix ARM build platform issue

Browse source
This commit is contained in:
Shyam Sunder 2021-09-19 12:03:32 -04:00
parent c64983002e
commit c3b81371d8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build-containers.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
- name: Build container - name: Build container
run: > run: >
docker buildx build --push docker buildx build --push
--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --platform linux/amd64,linux/arm/v7,linux/arm64/v8
--build-arg BUILD_INFO=${{ env.build_info }} --build-arg BUILD_INFO=${{ env.build_info }}
--build-arg BUILD_DATE=${{ env.build_date }} --build-arg BUILD_DATE=${{ env.build_date }}
--build-arg SOURCE_COMMIT=$GITHUB_SHA --build-arg SOURCE_COMMIT=$GITHUB_SHA
@ -93,7 +93,7 @@ jobs:
- name: Build container - name: Build container
run: > run: >
docker buildx build --push docker buildx build --push
--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --platform linux/amd64,linux/arm/v7,linux/arm64/v8
--build-arg BUILD_DATE=${{ env.build_date }} --build-arg BUILD_DATE=${{ env.build_date }}
--build-arg SOURCE_COMMIT=$GITHUB_SHA --build-arg SOURCE_COMMIT=$GITHUB_SHA
--build-arg DOCKER_REPO=szurubooru/server --build-arg DOCKER_REPO=szurubooru/server

4
client/Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:lts as builder FROM --platform=$BUILDPLATFORM node:lts as builder
WORKDIR /opt/app WORKDIR /opt/app
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
@ -12,7 +12,7 @@ ARG CLIENT_BUILD_ARGS=""
RUN BASE_URL="__BASEURL__" node build.js --gzip ${CLIENT_BUILD_ARGS} RUN BASE_URL="__BASEURL__" node build.js --gzip ${CLIENT_BUILD_ARGS}
FROM scratch as approot FROM --platform=$BUILDPLATFORM scratch as approot
COPY docker-start.sh / COPY docker-start.sh /

2
server/Dockerfile
View file

@ -37,7 +37,7 @@ COPY ./ /opt/app/
RUN rm -rf /opt/app/szurubooru/tests RUN rm -rf /opt/app/szurubooru/tests
FROM prereqs as testing FROM --platform=$BUILDPLATFORM prereqs as testing
WORKDIR /opt/app WORKDIR /opt/app
RUN apk --no-cache add \ RUN apk --no-cache add \