Skip to content

Commit 892a49d

Browse files
committed
[armhf] roll buildstage back to alpine 3.12
[armhf] revert #125 and use py3-cryptography alpine package, avoiding rust-lang/cargo#9187 closes #127
1 parent 8dd2350 commit 892a49d

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Dockerfile.armhf

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Buildstage
2-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 as buildstage
2+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 as buildstage
33

44
# set NZBGET version
55
ARG NZBGET_RELEASE
@@ -65,14 +65,12 @@ LABEL maintainer="thelamer"
6565
RUN \
6666
echo "**** install build packages ****" && \
6767
apk add --no-cache --upgrade --virtual=build-dependencies \
68-
cargo \
69-
g++ \
68+
gcc \
7069
libc-dev \
71-
libffi-dev \
7270
libxml2-dev \
7371
libxslt-dev \
7472
make \
75-
openssl-dev \
73+
py3-cryptography \
7674
python3-dev && \
7775
echo "**** install packages ****" && \
7876
apk add --no-cache \
@@ -100,7 +98,6 @@ RUN \
10098
build-dependencies && \
10199
rm -rf \
102100
/root/.cache \
103-
/root/.cargo \
104101
/tmp/*
105102

106103
# add local files and files from buildstage

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ app_setup_block: |
7070
7171
# changelog
7272
changelogs:
73+
- { date: "08.04.21:", desc: "Revert buildstage to alpine 3.12 and fix py cryptography on armhf." }
7374
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
7475
- { date: "26.10.20:", desc: "Fix python dependencies." }
7576
- { date: "24.08.20:", desc: "Fix ignored umask environment variable." }

0 commit comments

Comments
 (0)