From 11c323912ce7ee52f08326290e5ca62f26eafbe5 Mon Sep 17 00:00:00 2001 From: imtbl Date: Wed, 11 Nov 2020 23:31:27 +0100 Subject: [PATCH 1/3] 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 b0cc25b..71e509f 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 + ## [4.0.0] - 2020-10-22 ### Changed diff --git a/README.md b/README.md index b326573..3577ea0 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 414][hydrus-server-version]. +The latest build runs [hydrus server version 417][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 roughly @@ -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 mtbl/hydrus-server-docker:414 +user@local:~$ docker pull mtbl/hydrus-server-docker:417 ``` Alternatively, you can also build the image yourself: @@ -162,13 +162,13 @@ You are welcome to help out! [AGPLv3](LICENSE) © imtbl [hydrus-server]: http://hydrusnetwork.github.io/hydrus/ -[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v414 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v417 [docker-hub]: https://hub.docker.com/r/mtbl/hydrus-server-docker/ [docker-hub-tags]: https://hub.docker.com/r/mtbl/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%20414-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20417-blue.svg [travis]: https://travis-ci.com/imtbl/hydrus-server-docker [travis-badge]: https://travis-ci.com/imtbl/hydrus-server-docker.svg diff --git a/hydrus b/hydrus index 7c8714d..b2d0e31 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 7c8714d1fcd5b26683048bc5efe32bed23a082ac +Subproject commit b2d0e31b8705e698d1672275e6d1a9cdea556f5b From 2691ad0ca627b4642101a4d546a75144fb3e3267 Mon Sep 17 00:00:00 2001 From: imtbl Date: Wed, 11 Nov 2020 23:33:50 +0100 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 71e509f..ee3716c 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 ## [4.0.0] - 2020-10-22 diff --git a/Dockerfile b/Dockerfile index a2fa0e8..a9f969a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,14 +44,14 @@ RUN \ beautifulsoup4~=4.9.3 \ chardet~=3.0.4 \ lz4~=3.1.0 \ - numpy~=1.19.2 \ - opencv-python-headless~=4.4.0.44 \ - pillow~=8.0.0 \ - psutil~=5.7.2 \ + numpy~=1.19.4 \ + opencv-python-headless~=4.4.0.46 \ + pillow~=8.0.1 \ + psutil~=5.7.3 \ pylzma~=0.5.0 \ pyopenssl~=19.1.0 \ pyyaml~=5.3.1 \ - requests~=2.24.0 \ + requests~=2.25.0 \ send2trash~=1.5.0 \ service_identity~=18.1.0 \ twisted~=20.3.0 && \ From f587f542ef5dad4fe041af0cdbffa772bb4b98e5 Mon Sep 17 00:00:00 2001 From: imtbl Date: Wed, 11 Nov 2020 23:37:35 +0100 Subject: [PATCH 3/3] docs: update changelog for release 4.1.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee3716c..8cb522f 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] +## [4.1.0] - 2020-11-11 + ### Changed + Updated hydrus server version @@ -382,7 +384,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. + Initial release -[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.0.0...develop +[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.1.0...develop +[4.1.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.0.0...4.1.0 [4.0.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.29.0...4.0.0 [3.29.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.28.0...3.29.0 [3.28.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.27.0...3.28.0