From b4f3a58863b6aa87346bf6ce596071e78e582512 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Sat, 3 Aug 2019 16:54:13 +0200 Subject: [PATCH 1/2] feat: Update hydrus server version --- CHANGELOG.md | 4 ++++ Dockerfile | 4 ++-- README.md | 8 ++++---- hydrus | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b66e62a..17ec4ea 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.7.0] - 2019-07-28 ### Changed diff --git a/Dockerfile b/Dockerfile index 3be885e..b28e3ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,12 +48,12 @@ RUN \ chardet~=3.0.4 \ lz4~=2.1.10 \ numpy~=1.17.0 \ + opencv-python-headless~=4.1.0.25 \ pillow~=6.1.0 \ psutil~=5.6.3 \ pylzma~=0.5.0 \ pyopenssl~=19.0.0 \ - pyyaml~=5.1.1 \ - opencv-python-headless~=4.1.0.25 \ + pyyaml~=5.1.2 \ requests~=2.22.0 \ send2trash~=1.5.0 \ service_identity~=18.1.0 \ diff --git a/README.md b/README.md index fffe6a1..95ae29a 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 360][hydrus-server-version]. +The latest build runs [hydrus server version 362][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:360 +user@local:~$ docker pull mserajnik/hydrus-server-docker:362 ``` See [here][docker-hub-tags] for all the available version numbers/tags. @@ -169,13 +169,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/v360 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v362 [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%20360-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20362-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 9b02a8f..5f561d9 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 9b02a8fce61e76b8b8919183578d9242169cf796 +Subproject commit 5f561d9d60dd9c3f0f46edab8617cfc89b329f45 From 6fd9783a15e2decf3dd2e00062888be985f7a4f1 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Sat, 3 Aug 2019 16:56:07 +0200 Subject: [PATCH 2/2] docs: Update changelog for release 3.8.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17ec4ea..4296cd0 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.8.0] - 2019-08-03 + ### Changed + Updated hydrus server version @@ -225,7 +227,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.7.0...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.8.0...develop +[3.8.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.7.0...3.8.0 [3.7.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.6.0...3.7.0 [3.6.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.5.0...3.6.0 [3.5.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.4.0...3.5.0