From cdaed4b03dea2294533d3ff58d745f6a13dc39d4 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 8 Oct 2019 19:28:54 +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 607492b..afb482c 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.14.0] - 2019-09-29 ### Changed diff --git a/Dockerfile b/Dockerfile index 671093b..9ce41b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,12 +39,12 @@ RUN \ virtualenv venv && \ . venv/bin/activate && \ pip install \ - beautifulsoup4~=4.8.0 \ + beautifulsoup4~=4.8.1 \ chardet~=3.0.4 \ lz4~=2.2.1 \ numpy~=1.17.2 \ opencv-python-headless~=4.1.1.26 \ - pillow~=6.1.0 \ + pillow~=6.2.0 \ psutil~=5.6.3 \ pylzma~=0.5.0 \ pyopenssl~=19.0.0 \ diff --git a/README.md b/README.md index 0d544ff..6204071 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 369][hydrus-server-version]. +The latest build runs [hydrus server version 370][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:369 +user@local:~$ docker pull mserajnik/hydrus-server-docker:370 ``` 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/v369 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v370 [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%20369-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20370-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 9e0dfd5..8d75db0 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 9e0dfd542aada3fec17dfcc3d982a6a5a02e1546 +Subproject commit 8d75db00f5c68cba0a5064d27834baa83c4c8644 From a0c182135e99820e918a85f95c9b293703977aa2 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Tue, 8 Oct 2019 19:29:53 +0200 Subject: [PATCH 2/2] docs: Update changelog for release 3.15.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afb482c..0736ed4 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.15.0] - 2019-10-08 + ### Changed + Updated hydrus server version @@ -268,7 +270,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.14.0...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.15.0...develop +[3.15.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.14.0...3.15.0 [3.14.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.13.0...3.14.0 [3.13.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.12.0...3.13.0 [3.12.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.11.0...3.12.0