From b30a0c664d38cb99a0138209f502fdbbdb482c63 Mon Sep 17 00:00:00 2001 From: Jack Date: Sat, 26 Aug 2023 03:21:53 +0100 Subject: [PATCH] Update Dockerfile --- motioneye/Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/motioneye/Dockerfile b/motioneye/Dockerfile index 6677208..738c4e9 100644 --- a/motioneye/Dockerfile +++ b/motioneye/Dockerfile @@ -20,20 +20,23 @@ RUN case "$(dpkg --print-architecture)" in \ DEBIAN_FRONTEND="noninteractive" apt-get -qq --option Dpkg::Options::="--force-confnew" --no-install-recommends install \ ca-certificates curl python3 fdisk $PACKAGES && \ curl -sSfO 'https://bootstrap.pypa.io/get-pip.py' && \ - python3 get-pip.py && \ - python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \ + python3 get-pip.py + +RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \ python3 -m pip install --no-cache-dir /tmp/motioneye && \ python3 -m pip install --no-cache-dir pytz && \ - motioneye_init --skip-systemd --skip-apt-update && \ + motioneye_init --skip-systemd --skip-apt-update + # Change uid/gid of user/group motion to match our desired IDs. This will # make it easier to use execute motion as our desired user later. - sed -i "s/^\(motion:[^:]*\):[0-9]*:[0-9]*:\(.*\)/\1:${RUN_UID}:${RUN_GID}:\2/" /etc/passwd && \ +RUN sed -i "s/^\(motion:[^:]*\):[0-9]*:[0-9]*:\(.*\)/\1:${RUN_UID}:${RUN_GID}:\2/" /etc/passwd && \ sed -i "s/^\(motion:[^:]*\):[0-9]*:\(.*\)/\1:${RUN_GID}:\2/" /etc/group && \ mv /etc/motioneye/motioneye.conf /etc/motioneye.conf.sample && \ mkdir /var/log/motioneye /var/lib/motioneye && \ - chown motion:motion /var/log/motioneye /var/lib/motioneye && \ + chown motion:motion /var/log/motioneye /var/lib/motioneye + # Cleanup - python3 -m pip uninstall -y pip setuptools wheel && \ +RUN python3 -m pip uninstall -y pip setuptools wheel && \ DEBIAN_FRONTEND="noninteractive" apt-get -qq autopurge $PACKAGES && \ apt-get clean && \ rm -r /var/lib/apt/lists /var/cache/apt /tmp/motioneye get-pip.py /root/.cache