From dd9824526ea671f5760a6265b8918d557e47af02 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 16 Apr 2020 20:45:32 +0200 Subject: [PATCH 1/3] feat: update hydrus server version --- CHANGELOG.md | 4 ++++ README.md | 16 ++++++++-------- hydrus | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 387ff26..8dd9b66 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.26.0] - 2020-03-17 ### Changed diff --git a/README.md b/README.md index 72a8d0e..e686807 100644 --- a/README.md +++ b/README.md @@ -5,13 +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 388][hydrus-server-version]. +The latest build runs [hydrus server version 393][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). +infrequent, a new release of this Docker setup is only made roughly +every fourth hydrus release. This comes out to about 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 @@ -40,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:388 +user@local:~$ docker pull mserajnik/hydrus-server-docker:393 ``` Alternatively, you can also build the image yourself: @@ -168,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/v388 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v393 [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%20388-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20393-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 3edc910..70ddb9d 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 3edc910a965a3bd65fb11c1a7d9c00fd9be7ff6c +Subproject commit 70ddb9da843d0449fc8cc9bd57cc03aec8342321 From f6a58d6bf1e4de3578d63b083ac3743c1cdba1a6 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 16 Apr 2020 20:58:59 +0200 Subject: [PATCH 2/3] chore: update dependencies --- CHANGELOG.md | 1 + Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd9b66..ddb25ef 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.26.0] - 2020-03-17 diff --git a/Dockerfile b/Dockerfile index a571933..37d7129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,20 +25,20 @@ RUN \ virtualenv venv && \ . venv/bin/activate && \ pip install \ - beautifulsoup4~=4.8.2 \ + beautifulsoup4~=4.9.0 \ chardet~=3.0.4 \ lz4~=3.0.2 \ numpy~=1.18.2 \ - opencv-python-headless~=4.2.0.32 \ - pillow~=7.0.0 \ + opencv-python-headless~=4.2.0.34 \ + pillow~=7.1.1 \ psutil~=5.7.0 \ pylzma~=0.5.0 \ pyopenssl~=19.1.0 \ - pyyaml~=5.3 \ + pyyaml~=5.3.1 \ requests~=2.23.0 \ send2trash~=1.5.0 \ service_identity~=18.1.0 \ - twisted~=19.10.0 && \ + twisted~=20.3.0 && \ rm -r ~/.cache && \ apt-get remove build-essential --purge -y && \ apt-get clean && apt-get autoremove --purge -y && \ From be483470ab63f05e81db8150a0c19a0ee5a8e479 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 16 Apr 2020 21:00:10 +0200 Subject: [PATCH 3/3] docs: update changelog for release 3.27.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb25ef..9a3757d 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.27.0] - 2020-04-16 + ### Changed + Updated hydrus server version @@ -354,7 +356,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.26.0...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.27.0...develop +[3.27.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.26.0...3.27.0 [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