Merge branch 'release/3.0.0'

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.0.0] - 2019-05-18
+
+### Changed
+
++ Switched base image to Debian to make usage of OpenCV feasible
++ Added OpenCV
+
 ## [2.15.0] - 2019-05-11
 
 ### Changed
@@ -171,7 +178,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 + Initial release
 
-[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/2.15.0...develop
+[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.0.0...develop
+[3.0.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.15.0...3.0.0
 [2.15.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.14.0...2.15.0
 [2.14.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.13.0...2.14.0
 [2.13.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.12.0...2.13.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.7-slim-stretch
 
 ARG HOST_USER_ID=1000
 ARG HOST_GROUP_ID=1000
@@ -8,15 +8,16 @@ ENV HOST_GROUP_ID=$HOST_GROUP_ID
 
 RUN \
   if [ $(getent group ${HOST_GROUP_ID}) ]; then \
-    adduser -D -u ${HOST_USER_ID} hydrus; \
+    useradd -r -u ${HOST_USER_ID} hydrus; \
   else \
-    addgroup -g ${HOST_GROUP_ID} hydrus && \
-    adduser -D -u ${HOST_USER_ID} -G hydrus hydrus; \
+    groupadd -g ${HOST_GROUP_ID} hydrus && \
+    useradd -r -u ${HOST_USER_ID} -g hydrus hydrus; \
   fi
 
 WORKDIR /usr/src/app
 
 COPY ./hydrus .
+COPY ./deb .
 
 RUN \
   chown -R hydrus:hydrus /usr/src/app && \
@@ -28,18 +29,15 @@ RUN \
     bin/upnpc_osx \
     bin/upnpc_win32.exe && \
   mkdir /data && chown -R hydrus:hydrus /data && \
-  apk --no-cache add \
-    build-base \
+  apt-get update && apt-get install -y \
+    build-essential \
     ffmpeg \
-    jpeg-dev \
-    libffi-dev \
-    linux-headers \
-    openssl \
-    openssl-dev \
-    zlib-dev && \
+    wget && \
+  dpkg -i libjpeg8_8d-1+deb7u1_amd64.deb && \
+  rm libjpeg8_8d-1+deb7u1_amd64.deb && \
   pip install virtualenv && \
   virtualenv venv && \
-  source venv/bin/activate && \
+  . venv/bin/activate && \
   pip install \
     beautifulsoup4~=4.7.1 \
     lz4~=2.1.6 \
@@ -49,12 +47,14 @@ RUN \
     pylzma~=0.5.0 \
     pyopenssl~=18.0.0 \
     pyyaml~=3.13 \
+    opencv-python-headless~=4.1.0.25 \
     requests~=2.21.0 \
     send2trash~=1.5.0 \
     service_identity~=18.1.0 \
     twisted~=18.9.0 && \
   rm -r ~/.cache && \
-  apk del build-base jpeg-dev libffi-dev linux-headers openssl-dev zlib-dev
+  apt-get clean && apt-get autoclean && apt-get autoremove --purge -y && \
+  rm -rf /var/lib/apt/lists/*
 
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint

README.md

@@ -1,8 +1,8 @@
 # hydrus-server-docker [![hydrus server version][hydrus-server-badge]][hydrus-server-version] [![Build status][travis-badge]][travis] [![Docker Hub build][docker-hub-badge]][docker-hub]
 
-> [hydrus server][hydrus-server] running on Alpine
+> [hydrus server][hydrus-server] running on Debian
 
-This is a simple Alpine-based Docker setup for running
+This is a simple Debian-based Docker setup for running
 [hydrus server][hydrus-server] from source.
 
 The latest build runs [hydrus server version 351][hydrus-server-version].
@@ -12,6 +12,7 @@ The latest build runs [hydrus server version 351][hydrus-server-version].
 + [Install](#install)
   + [Dependencies](#dependencies)
   + [Updating](#updating)
+    + [Upgrading from 2.x to 3.x](#upgrading-from-2x-to-3x)
     + [Upgrading from 1.x to 2.x](#upgrading-from-1x-to-2x)
 + [Usage](#usage)
   + [Additional configuration when building](#additional-configuration-when-building)
@@ -63,6 +64,14 @@ are therefore always safe to simply install via the routine mentioned before.
 When necessary, this section will be expanded with upgrade guides to new major
 versions.
 
+#### Upgrading from 2.x to 3.x
+
+Upgrading from `2.x` to `3.x` can be done via pulling the updated image from
+Docker Hub or building it yourself and requires no further manual changes.
+
+Due to the introduction of OpenCV to hydrus server (which is hard to build on
+Alpine), the Docker image is now based on Debian instead of Alpine instead.
+
 #### Upgrading from 1.x to 2.x
 
 Upgrading from `1.x` to `2.x` can be done via pulling the updated image from

docker-entrypoint.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-source venv/bin/activate
+. venv/bin/activate
 
 stop() {
   ./server.py stop -d="/data"