Remove riscv64 from build

This commit is contained in:
Cyb3r-Jak3 2024-09-29 23:27:17 -04:00
parent 3f762da1e6
commit abe52a9cfd
No known key found for this signature in database
3 changed files with 34 additions and 20 deletions

View File

@ -16,7 +16,7 @@ on:
env: env:
DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO: shenxn/protonmail-bridge
DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64 PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7
jobs: jobs:
build: build:
@ -94,3 +94,5 @@ jobs:
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
cache-from: type=gha
cache-to: type=gha,mode=max

View File

@ -16,10 +16,16 @@ on:
env: env:
DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO: shenxn/protonmail-bridge
DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64
jobs: jobs:
deb: deb:
runs-on: ubuntu-latest runs-on: ubuntu-latest
services:
registry:
image: registry:2
ports:
- 5000:5000
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -36,22 +42,25 @@ jobs:
images: ${{ steps.repo.outputs.repo }} images: ${{ steps.repo.outputs.repo }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
with:
driver-opts: network=host
- name: Build image without push - name: Build image without push
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
context: ./deb context: ./deb
file: ./deb/Dockerfile file: ./deb/Dockerfile
load: true push: true
tags: protonmail-bridge:latest tags: localhost:5000/protonmail-bridge:latest
cache-from: type=gha cache-from: type=gha
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
platforms: ${{ env.PLATFORMS }}
- name: Scan image - name: Scan image
id: scan id: scan
uses: anchore/scan-action@v4 uses: anchore/scan-action@v4
with: with:
image: protonmail-bridge:latest image: localhost:5000/protonmail-bridge:latest
fail-build: false fail-build: false
severity-cutoff: critical severity-cutoff: critical
output-format: sarif output-format: sarif
@ -80,5 +89,8 @@ jobs:
tags: | tags: |
${{ steps.repo.outputs.repo }}:latest ${{ steps.repo.outputs.repo }}:latest
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }} ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}
platforms: ${{ env.PLATFORMS }}
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
cache-from: type=gha
cache-to: type=gha,mode=max

View File

@ -16,7 +16,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
wget \ wget \
binutils \ binutils \
xz-utils \ xz-utils \
libsecret-1-0 \ libsecret-1-dev \
libgl1 libgl1
# Build # Build
@ -38,21 +38,21 @@ EXPOSE 143/tcp
# && apt-get -y --no-install-recommends install \ # && apt-get -y --no-install-recommends install \
# libc6 socat pass libsecret-1-0 ca-certificates # libc6 socat pass libsecret-1-0 ca-certificates
RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \ # RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
--mount=target=/var/cache/apt,type=cache,sharing=locked \ # --mount=target=/var/cache/apt,type=cache,sharing=locked \
rm -f /etc/apt/apt.conf.d/docker-clean \ # rm -f /etc/apt/apt.conf.d/docker-clean \
&& apt-get update \ # && apt-get update \
&& apt-get upgrade -y \ # && apt-get upgrade -y \
&& apt-get -y --no-install-recommends install \ # && apt-get -y --no-install-recommends install \
libc6 \ # libc6 \
socat \ # socat \
pass \ # pass \
ca-certificates \ # ca-certificates \
wget \ # wget \
binutils \ # binutils \
xz-utils \ # xz-utils \
libsecret-1-0 \ # libsecret-1-dev \
libgl1 # libgl1
# Copy bash scripts # Copy bash scripts
COPY gpgparams entrypoint.sh /protonmail/ COPY gpgparams entrypoint.sh /protonmail/