Use debian bullseye base images for better arm support, build only amd64 * arm/v7 images

This commit is contained in:
simojenki
2021-12-22 16:29:20 +11:00
parent a217886ce5
commit 7d28b7bf4b
2 changed files with 17 additions and 8 deletions

View File

@@ -21,7 +21,7 @@ jobs:
- -
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 16.6.x node-version: '16'
- -
run: yarn install run: yarn install
- -
@@ -62,7 +62,7 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm/v7
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

View File

@@ -1,4 +1,4 @@
FROM node:16.6-alpine as build FROM node:16-bullseye as build
WORKDIR /bonob WORKDIR /bonob
@@ -17,23 +17,28 @@ COPY .yarnrc.yml .
COPY .yarn/releases ./.yarn/releases COPY .yarn/releases ./.yarn/releases
ENV JEST_TIMEOUT=30000 ENV JEST_TIMEOUT=30000
ENV DEBIAN_FRONTEND=noninteractive
RUN apk add --no-cache --update --virtual .gyp \ RUN apt-get update && \
vips-dev \ apt-get -y upgrade && \
apt-get -y install --no-install-recommends \
libvips-dev \
python3 \ python3 \
make \ make \
git \ git \
g++ && \ g++ && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
yarn install --immutable && \ yarn install --immutable && \
yarn gitinfo && \ yarn gitinfo && \
yarn test --no-cache && \ yarn test --no-cache && \
yarn build yarn build
FROM node:16-bullseye
FROM node:16.6-alpine
ENV BNB_PORT=4534 ENV BNB_PORT=4534
ENV DEBIAN_FRONTEND=noninteractive
EXPOSE $BNB_PORT EXPOSE $BNB_PORT
@@ -48,7 +53,11 @@ COPY --from=build /bonob/.gitinfo ./
COPY web ./web COPY web ./web
COPY src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl ./src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl COPY src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl ./src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
RUN apk add --no-cache --update vips RUN apt-get update && \
apt-get -y upgrade && \
apt-get -y install --no-install-recommends libvips && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
USER nobody USER nobody
WORKDIR /bonob/src WORKDIR /bonob/src