From a957e1fc45cc23f3adf371a0eec9607061242017 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 22 Nov 2021 12:22:07 +0100 Subject: [PATCH] root: install cargo for cryptography build Signed-off-by: Jens Langhammer --- .github/workflows/ci-main.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 3f11163b0..1e89a6c75 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -234,8 +234,8 @@ jobs: matrix: arch: - 'linux/amd64' - # - 'linux/arm64' - # - 'linux/arm/v7' + - 'linux/arm64' + - 'linux/arm/v7' steps: - uses: actions/checkout@v2 - name: Set up QEMU diff --git a/Dockerfile b/Dockerfile index 554bde120..c62d0c451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,11 +58,11 @@ ENV GIT_BUILD_HASH=$GIT_BUILD_HASH RUN apt-get update && \ apt-get install -y --no-install-recommends \ - curl ca-certificates gnupg git runit rustc libpq-dev \ + curl ca-certificates gnupg git runit rustc cargo libpq-dev \ postgresql-client build-essential libxmlsec1-dev \ pkg-config libmaxminddb0 libffi7 libffi-dev zlib1g-dev && \ pip install -r /requirements.txt --no-cache-dir && \ - apt-get remove --purge -y build-essential git rustc && \ + apt-get remove --purge -y build-essential git rustc cargo && \ apt-get autoremove --purge -y && \ apt-get clean && \ rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/ && \