Skip to content

Commit ba9e77b

Browse files
authored
Merge pull request #48 from linuxserver/ubuntu
rebase to ubuntu jammy
2 parents aa4451e + a7a8442 commit ba9e77b

15 files changed

+60
-34
lines changed

.editorconfig

100755100644
File mode changed.

.github/CONTRIBUTING.md

100755100644
File mode changed.

.github/FUNDING.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/config.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/permissions.yml

100755100644
File mode changed.

Dockerfile

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM ghcr.io/linuxserver/unrar:latest as unrar
44

5-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
5+
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
66

77
# set version label
88
ARG BUILD_DATE
@@ -11,22 +11,25 @@ ARG MYLAR3_RELEASE
1111
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
1212
LABEL maintainer="aptalca"
1313

14+
ARG DEBIAN_FRONTEND="noninteractive"
15+
1416
RUN \
1517
echo "**** install build dependencies ****" && \
16-
apk add --no-cache --virtual=build-dependencies \
17-
build-base \
18-
jpeg-dev \
18+
apt-get update && \
19+
apt-get install -y --no-install-recommends \
20+
build-essential \
1921
libffi-dev \
22+
libjpeg9-dev \
2023
libwebp-dev \
2124
python3-dev \
22-
zlib-dev && \
25+
zlib1g-dev && \
2326
echo "**** install runtime packages ****" && \
24-
apk add --no-cache \
25-
jpeg \
26-
libwebp-tools \
27+
apt-get install -y --no-install-recommends \
28+
libjpeg9 \
2729
nodejs \
28-
python3 \
29-
zlib && \
30+
python3-venv \
31+
webp \
32+
zlib1g-dev && \
3033
echo "**** install mylar3 ****" && \
3134
if [ -z ${MYLAR3_RELEASE+x} ]; then \
3235
MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/releases/latest \
@@ -43,19 +46,28 @@ RUN \
4346
pip install -U --no-cache-dir \
4447
pip \
4548
wheel && \
46-
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r requirements.txt && \
49+
pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
50+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4751
echo "**** cleanup ****" && \
48-
apk del --purge \
49-
build-dependencies && \
52+
apt-get -y purge \
53+
build-essential \
54+
libffi-dev \
55+
libjpeg9-dev \
56+
libwebp-dev \
57+
python3-dev \
58+
zlib1g-dev && \
59+
apt-get -y autoremove && \
5060
rm -rf \
51-
/root/.cache \
52-
/tmp/*
61+
/tmp/* \
62+
/var/lib/apt/lists/* \
63+
/var/tmp/* \
64+
$HOME/.cache
5365

5466
# add local files
5567
COPY root/ /
5668

5769
# add unrar
58-
COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
70+
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
5971

6072
# ports and volumes
6173
VOLUME /config

0 commit comments

Comments
 (0)