Skip to content

Commit

Permalink
[armhf] roll buildstage back to alpine 3.12
Browse files Browse the repository at this point in the history
[armhf] revert linuxserver#125 and use py3-cryptography alpine package, avoiding rust-lang/cargo#9187

closes linuxserver#127
  • Loading branch information
capntrips committed Apr 8, 2021
1 parent 8dd2350 commit 892a49d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 as buildstage

# set NZBGET version
ARG NZBGET_RELEASE
Expand Down Expand Up @@ -65,14 +65,12 @@ LABEL maintainer="thelamer"
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
cargo \
g++ \
gcc \
libc-dev \
libffi-dev \
libxml2-dev \
libxslt-dev \
make \
openssl-dev \
py3-cryptography \
python3-dev && \
echo "**** install packages ****" && \
apk add --no-cache \
Expand Down Expand Up @@ -100,7 +98,6 @@ RUN \
build-dependencies && \
rm -rf \
/root/.cache \
/root/.cargo \
/tmp/*

# add local files and files from buildstage
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "08.04.21:", desc: "Revert buildstage to alpine 3.12 and fix py cryptography on armhf." }
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "26.10.20:", desc: "Fix python dependencies." }
- { date: "24.08.20:", desc: "Fix ignored umask environment variable." }
Expand Down

0 comments on commit 892a49d

Please sign in to comment.