diff --git a/Dockerfile b/Dockerfile index 2cebe44..faa7e2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,4 @@ -FROM alpine:edge as builder -RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ - apk add alpine-sdk doas uasm && \ - echo 'permit nopass :wheel' > /etc/doas.d/doas.conf && \ - git clone --depth=1 https://gitlab.alpinelinux.org/alpine/aports.git && \ - git config --global user.name "build" && \ - git config --global user.email "build@local" && \ - abuild-keygen -a -i -n && \ - cd aports/main/7zip && \ - sed -i 's/DISABLE_RAR=1/USE_ASM=1/' APKBUILD && \ - abuild -F && \ - cd && \ - cp packages/main/*/7zip-[0-9]*.apk 7zip.apk - -FROM ghcr.io/linuxserver/baseimage-alpine:edge - +FROM ghcr.io/linuxserver/baseimage-alpine:3.19 # set version label ARG DOCKER_IMAGE_CREATED ARG VERSION @@ -21,11 +6,10 @@ LABEL build_version="pyload docker version:- ${VERSION} Build-date:- ${DOCKER_IM ENV HOME="/config" -COPY --from=builder /root/7zip.apk . - RUN \ - apk add --no-cache --allow-untrusted 7zip.apk && \ - rm -f 7zip.apk && \ + wget https://nexus.nyyu.dev/repository/files/alpine/7zip-23.01-r0.apk && \ + apk add --no-cache --allow-untrusted 7zip*.apk && \ + rm -f 7zip*.apk && \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \