Add support for arm64 Docker builds

This commit is contained in:
George Gevoian 2022-04-03 16:43:29 -07:00
parent 24522e61ff
commit 3482cd1045
3 changed files with 43 additions and 15 deletions

View File

@ -13,10 +13,29 @@ jobs:
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Push to Docker Hub - name: Docker meta
uses: docker/build-push-action@v1 id: meta
uses: docker/metadata-action@v3
with:
images: |
${{ github.repository_owner }}/grist
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Log in to Docker Hub
uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
repository: ${{ github.repository_owner }}/grist - name: Push to Docker Hub
tag_with_ref: true uses: docker/build-push-action@v2
with:
context: .
push: true
platforms: linux/amd64,linux/arm64/v8
tags: ${{ steps.meta.outputs.tags }}

View File

@ -24,14 +24,16 @@ jobs:
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: latest_candidate ref: latest_candidate
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Prepare image but do not push it yet - name: Prepare image but do not push it yet
uses: docker/build-push-action@v1 uses: docker/build-push-action@v2
with: with:
username: ${{ secrets.DOCKER_USERNAME }} context: .
password: ${{ secrets.DOCKER_PASSWORD }} load: true
repository: ${{ github.repository_owner }}/grist tags: ${{ github.repository_owner }}/grist:latest
tags: latest
push: false
- name: Use Node.js ${{ matrix.node-version }} for testing - name: Use Node.js ${{ matrix.node-version }} for testing
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
@ -50,13 +52,18 @@ jobs:
run: yarn run build:prod run: yarn run build:prod
- name: Run tests - name: Run tests
run: TEST_IMAGE=${{ github.repository_owner }}/grist VERBOSE=1 DEBUG=1 MOCHA_WEBDRIVER_HEADLESS=1 yarn run test:docker run: TEST_IMAGE=${{ github.repository_owner }}/grist VERBOSE=1 DEBUG=1 MOCHA_WEBDRIVER_HEADLESS=1 yarn run test:docker
- name: Push to Docker Hub - name: Log in to Docker Hub
uses: docker/build-push-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
repository: ${{ github.repository_owner }}/grist - name: Push to Docker Hub
tags: latest uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/arm64/v8
push: true
tags: ${{ github.repository_owner }}/grist:latest
- name: Update latest branch - name: Update latest branch
uses: ad-m/github-push-action@8407731efefc0d8f72af254c74276b7a90be36e1 uses: ad-m/github-push-action@8407731efefc0d8f72af254c74276b7a90be36e1
with: with:

View File

@ -30,7 +30,9 @@ ADD sandbox/requirements.txt requirements.txt
ADD sandbox/requirements3.txt requirements3.txt ADD sandbox/requirements3.txt requirements3.txt
RUN \ RUN \
apt update && \ apt update && \
apt install -y --no-install-recommends python2 python-pip python-setuptools && \ apt install -y --no-install-recommends python2 python-pip python-setuptools \
build-essential libxml2-dev libxslt-dev python-dev zlib1g-dev && \
pip2 install wheel && \
pip2 install -r requirements.txt && \ pip2 install -r requirements.txt && \
pip3 install -r requirements3.txt pip3 install -r requirements3.txt