github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-14 10:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	.github/workflows/publishdocker-branch.yml
#	Dockerfile
This commit is contained in:
JonnyWong16 2020-04-12 18:30:34 -07:00
commit 94f929743c
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
10 changed files with 109 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dockerfile
View file

@ -1,9 +1,9 @@
FROM python:3.8.2-slim
FROM tautulli/tautulli-baseimage:python3
LABEL maintainer="TheMeanCanEHdian"
LABEL maintainer="Tautulli"
ARG VERSION
ARG BRANCH
ARG COMMIT
ENV TAUTULLI_DOCKER=True
ENV TZ=UTC
@ -11,16 +11,8 @@ ENV TZ=UTC
WORKDIR /app
RUN \
apt-get -q -y update --no-install-recommends && \
apt-get install -q -y --no-install-recommends \
curl && \
rm -rf /var/lib/apt/lists/* && \
pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir --upgrade \
pycryptodomex \
pyopenssl && \
echo ${VERSION} > /app/version.txt && \
echo ${BRANCH} > /app/branch.txt
echo ${BRANCH} > /app/branch.txt && \
echo ${COMMIT} > /app/version.txt
COPY . /app