From 53f317ae97a7e51de824756ce868ea79e3e13c8c Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 17 Mar 2020 18:45:17 +0100 Subject: [PATCH 1/4] feat: update hydrus server version --- CHANGELOG.md | 4 ++++ README.md | 8 ++++---- hydrus | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47a2bee..2caa749 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + ++ Updated hydrus server version + ## [3.25.0] - 2020-02-13 ### Changed diff --git a/README.md b/README.md index ad62789..b234348 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 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]. ## Table of contents @@ -34,7 +34,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 +162,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 diff --git a/hydrus b/hydrus index b6e0948..3edc910 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit b6e0948fda39b6b3daab20dcf8dffe17b3d44485 +Subproject commit 3edc910a965a3bd65fb11c1a7d9c00fd9be7ff6c From 5874f2e9da7bae63c34beebf8c49e1e850846704 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 17 Mar 2020 18:48:06 +0100 Subject: [PATCH 2/4] chore: update dependencies --- CHANGELOG.md | 1 + Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2caa749..827bedf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed + Updated hydrus server version ++ Updated dependencies ## [3.25.0] - 2020-02-13 diff --git a/Dockerfile b/Dockerfile index effdf51..a571933 100644 --- a/Dockerfile +++ b/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 && \ From 66bf7fa63df89fc2f4abf8177678a9f64c8eeb95 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 17 Mar 2020 19:07:01 +0100 Subject: [PATCH 3/4] docs: add information about release schedule --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b234348..72a8d0e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ This is a simple Debian-based Docker setup for running 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 + [Install](#install) From 33845d982dd6bd5537bc32f4392c850f047e7e8b Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 17 Mar 2020 19:09:23 +0100 Subject: [PATCH 4/4] docs: update changelog for release 3.26.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 827bedf..387ff26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ 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 @@ -347,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