From dad8547212b405499a86f6502fea7cf54db90255 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Mon, 22 Nov 2021 14:29:21 +0100
Subject: [PATCH] root: remove arm/v7

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 .github/workflows/ci-main.yml         | 2 --
 .github/workflows/ci-outpost.yml      | 2 --
 .github/workflows/release-publish.yml | 2 --
 Dockerfile                            | 6 +++---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 1e89a6c75..400527b3e 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -234,8 +234,6 @@ jobs:
       matrix:
         arch:
           - 'linux/amd64'
-          - 'linux/arm64'
-          - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - name: Set up QEMU
diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml
index 9b2d5723b..0e3e26531 100644
--- a/.github/workflows/ci-outpost.yml
+++ b/.github/workflows/ci-outpost.yml
@@ -42,8 +42,6 @@ jobs:
           - ldap
         arch:
           - 'linux/amd64'
-          # - 'linux/arm64'
-          # - 'linux/arm/v7'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 699d061ab..5f5fe7b9b 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -14,7 +14,6 @@ jobs:
         arch:
           - 'linux/amd64'
           - 'linux/arm64'
-          - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - name: Set up QEMU
@@ -63,7 +62,6 @@ jobs:
         arch:
           - 'linux/amd64'
           - 'linux/arm64'
-          - 'linux/arm/v7'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
diff --git a/Dockerfile b/Dockerfile
index c62d0c451..47154bcfd 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 cargo libpq-dev \
+        curl ca-certificates gnupg git runit libpq-dev \
         postgresql-client build-essential libxmlsec1-dev \
-        pkg-config libmaxminddb0 libffi7 libffi-dev zlib1g-dev && \
+        pkg-config libmaxminddb0 && \
     pip install -r /requirements.txt --no-cache-dir && \
-    apt-get remove --purge -y build-essential git rustc cargo && \
+    apt-get remove --purge -y build-essential git && \
     apt-get autoremove --purge -y && \
     apt-get clean && \
     rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/ && \