update Dockerfile
fix: actually use TZ env variable and set it misc: some code reordering
This commit is contained in:
parent
45aba7806f
commit
284932173b
1 changed files with 28 additions and 8 deletions
36
Dockerfile
36
Dockerfile
|
@ -2,27 +2,47 @@
|
|||
|
||||
FROM ubuntu:jammy AS docker-cli
|
||||
|
||||
RUN apt update && \
|
||||
apt install --no-install-suggests --no-install-recommends -y ca-certificates curl gnupg lsb-release
|
||||
RUN apt-get update && \
|
||||
apt-get install --no-install-suggests --no-install-recommends --yes --quiet \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
lsb-release
|
||||
RUN mkdir -m 0755 -p /etc/apt/keyrings && \
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
|
||||
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
|
||||
RUN apt update && \
|
||||
apt install --no-install-suggests --no-install-recommends -y docker-ce-cli
|
||||
RUN apt-get update && \
|
||||
apt-get install --no-install-suggests --no-install-recommends --yes --quiet docker-ce-cli
|
||||
|
||||
FROM ubuntu:jammy
|
||||
|
||||
LABEL org.opencontainers.image.source="https://github.com/soxfor/qbittorrent-natmap"
|
||||
LABEL org.opencontainers.image.base.name="ubuntu:jammy"
|
||||
LABEL description="Map port via NAT-PMP and update qBittorrent configuration"
|
||||
LABEL version="1.0.6"
|
||||
LABEL version="1.0.7"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt update
|
||||
RUN apt install --no-install-suggests --no-install-recommends -y natpmpc curl bc netcat-openbsd
|
||||
RUN apt-get update
|
||||
RUN apt-get install --no-install-suggests --no-install-recommends --yes --quiet \
|
||||
natpmpc \
|
||||
curl \
|
||||
bc \
|
||||
netcat-openbsd \
|
||||
tzdata \
|
||||
locales
|
||||
RUN rm -rf /var/lib/apt/lists/* /var/cache/apt/*
|
||||
RUN apt clean
|
||||
RUN apt-get clean
|
||||
|
||||
ENV TZ=Etc/UTC
|
||||
ENV LANG=en_US.UTF-8
|
||||
ENV LANGUAGE=en_US:en
|
||||
ENV LC_ALL=en_US.UTF-8
|
||||
|
||||
RUN sed -i "/${LANG}/s/^# //g" /etc/locale.gen && \
|
||||
locale-gen && \
|
||||
ln -fs "/usr/share/zoneinfo/${TZ}" /etc/localtime && \
|
||||
dpkg-reconfigure tzdata
|
||||
|
||||
ENV QBITTORRENT_SERVER=
|
||||
ENV QBITTORRENT_PORT=8080
|
||||
|
|
Reference in a new issue