From 0541f29d9874ba13b19fd059929c2f5da3ffdbe2 Mon Sep 17 00:00:00 2001 From: Olof Nord Date: Wed, 6 Apr 2022 14:14:31 +0200 Subject: [PATCH] Add riscv64 support to docker builds * Adjust GitHub CI to also build for riscv64 * Update base Ubuntu base for build from 18.04 LTS to 20.04 LTS as to support riscv64 * Minor: Exclude idea IDE files from git --- .github/workflows/build.yaml | 2 +- .gitignore | 2 ++ README.md | 2 +- build/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d7fc6ed..439396a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,7 +16,7 @@ on: env: DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev - PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7 + PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64 jobs: build: diff --git a/.gitignore b/.gitignore index 722d5e7..366d839 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +# Ignoring IDE-specific files +.idea/* .vscode diff --git a/README.md b/README.md index 4c60a72..0c048b3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `b There are two types of images. - `deb`: Images based on the official [.deb release](https://protonmail.com/bridge/install). It only supports the `amd64` architecture. - - `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, and `arm/v7`. Supporting to more architectures is possible. PRs are welcome. + - `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, `arm/v7` and `riscv64`. Supporting to more architectures is possible. PRs are welcome. tag | description -- | -- diff --git a/build/Dockerfile b/build/Dockerfile index 5fd445a..73d3cf5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /build/ COPY build.sh VERSION /build/ RUN bash build.sh -FROM ubuntu:bionic +FROM ubuntu:focal LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp