Merge branch 'release/3.26.0'

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.26.0] - 2020-03-17
+
+### Changed
+
++ Updated hydrus server version
++ Updated dependencies
+
 ## [3.25.0] - 2020-02-13
 
 ### Changed
@@ -342,7 +349,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/3.25.0...develop
+[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.26.0...develop
+[3.26.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.25.0...3.26.0
 [3.25.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.24.0...3.25.0
 [3.24.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.23.1...3.24.0
 [3.23.1]: https://github.com/mserajnik/hydrus-server-docker/compare/3.23.0...3.23.1

Dockerfile

@@ -28,14 +28,14 @@ RUN \
     beautifulsoup4~=4.8.2 \
     chardet~=3.0.4 \
     lz4~=3.0.2 \
-    numpy~=1.18.1 \
+    numpy~=1.18.2 \
     opencv-python-headless~=4.2.0.32 \
     pillow~=7.0.0 \
-    psutil~=5.6.7 \
+    psutil~=5.7.0 \
     pylzma~=0.5.0 \
     pyopenssl~=19.1.0 \
     pyyaml~=5.3 \
-    requests~=2.22.0 \
+    requests~=2.23.0 \
     send2trash~=1.5.0 \
     service_identity~=18.1.0 \
     twisted~=19.10.0 && \

README.md

@@ -5,7 +5,13 @@
 This is a simple Debian-based Docker setup for running
 [hydrus server][hydrus-server] from source.
 
-The latest build runs [hydrus server version 384][hydrus-server-version].
+The latest build runs [hydrus server version 388][hydrus-server-version].
+
+Due to time constraints and the fact that changes to hydrus server are
+infrequent, a new release of this Docker setup is only made every fourth hydrus
+release (e.g., `388`, `392`, `396` etc.). This comes out to roughly one release
+per month. Exceptions may be made in particular instances that warrant a
+release outside of this schedule (e.g., important changes to hydrus server).
 
 ## Table of contents
 
@@ -34,7 +40,7 @@ By default, this will pull the latest build. To specify an image with a
 specific version of hydrus server, provide the version number as tag, e.g.:
 
 ```zsh
-user@local:~$ docker pull mserajnik/hydrus-server-docker:384
+user@local:~$ docker pull mserajnik/hydrus-server-docker:388
 ```
 
 Alternatively, you can also build the image yourself:
@@ -162,13 +168,13 @@ You are welcome to help out!
 [MIT](LICENSE.md) © Michael Serajnik
 
 [hydrus-server]: http://hydrusnetwork.github.io/hydrus/
-[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v384
+[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v388
 [docker-hub]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/
 [docker-hub-tags]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/tags/
 [docker]: https://www.docker.com/
 [semantic-versioning]: https://semver.org/
 
-[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20384-blue.svg
+[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20388-blue.svg
 
 [travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
 [travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg

hydrus

@@ -1 +1 @@
-Subproject commit b6e0948fda39b6b3daab20dcf8dffe17b3d44485
+Subproject commit 3edc910a965a3bd65fb11c1a7d9c00fd9be7ff6c