mirror of
https://github.com/linuxserver/docker-htpcmanager.git
synced 2026-04-06 00:01:54 +08:00
Merge pull request #26 from linuxserver/fix-build
Fix build, style changes.
This commit is contained in:
Roxedus
GitHub
commit
4e87641e52
80
Dockerfile
80
Dockerfile
@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="notdriz"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
python3 \
|
||||
py3-pip \
|
||||
git \
|
||||
vnstat \
|
||||
jq && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
git \
|
||||
jq \
|
||||
py3-pip \
|
||||
python3 \
|
||||
vnstat && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="notdriz"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
python3 \
|
||||
py3-pip \
|
||||
git \
|
||||
vnstat \
|
||||
jq && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
git \
|
||||
jq \
|
||||
py3-pip \
|
||||
python3 \
|
||||
vnstat && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="notdriz"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
python3 \
|
||||
py3-pip \
|
||||
git \
|
||||
vnstat \
|
||||
jq && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
autoconf \
|
||||
automake \
|
||||
cargo \
|
||||
freetype-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
jpeg-dev \
|
||||
lcms2-dev \
|
||||
libffi-dev \
|
||||
libpng-dev \
|
||||
libwebp-dev \
|
||||
libxml2-dev \
|
||||
libxslt-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openjpeg-dev \
|
||||
openssl-dev \
|
||||
python3-dev \
|
||||
tiff-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
git \
|
||||
jq \
|
||||
py3-pip \
|
||||
python3 \
|
||||
vnstat && \
|
||||
echo "**** install app ****" && \
|
||||
git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \
|
||||
echo "**** install pip packages ****" && \
|
||||
sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \
|
||||
pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/root/.cache \
|
||||
/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
@ -222,6 +222,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **08.04.21:** - Fix build.
|
||||
* **10.02.21:** - Rebasing to alpine 3.13.
|
||||
* **26.10.20:** - Rebase to alpine 3.12, python3, change upstream project
|
||||
* **19.12.19:** - Rebasing to alpine 3.11.
|
||||
|
||||
@ -42,6 +42,7 @@ app_setup_nginx_reverse_proxy_block: ""
|
||||
# changelog
|
||||
|
||||
changelogs:
|
||||
- { date: "08.04.21:", desc: "Fix build." }
|
||||
- { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
|
||||
- { date: "26.10.20:", desc: "Rebase to alpine 3.12, python3, change upstream project" }
|
||||
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
exec \
|
||||
s6-setuidgid abc python3 /app/htpcmanager/Htpc.py \
|
||||
--datadir /config
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user