From 4954ba7b0935131d98d486fee090f8a2341eece6 Mon Sep 17 00:00:00 2001 From: imtbl Date: Mon, 7 Sep 2020 20:06:45 +0200 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 d5d8be9..1cfa13d 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.28.0] - 2020-06-14 ### Changed diff --git a/README.md b/README.md index 673c385..5253551 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 400][hydrus-server-version]. +The latest build runs [hydrus server version 410][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 @@ -39,7 +39,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:400 +user@local:~$ docker pull mtbl/hydrus-server-docker:410 ``` Alternatively, you can also build the image yourself: @@ -153,13 +153,13 @@ You are welcome to help out! [MIT](LICENSE.md) © imtbl [hydrus-server]: http://hydrusnetwork.github.io/hydrus/ -[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v400 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v410 [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%20400-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20410-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 d7a0876..b1089fc 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit d7a0876b431f027238379f2bb4cfd403794a6eb2 +Subproject commit b1089fcc730ba993afafb3313fb8447b79049a51 From 12364732812c52875b2490c5c1ec8d7e7c3beb2d Mon Sep 17 00:00:00 2001 From: imtbl Date: Mon, 7 Sep 2020 20:09:38 +0200 Subject: [PATCH 2/3] chore: update dependencies --- CHANGELOG.md | 1 + Dockerfile | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cfa13d..a5e3a72 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.28.0] - 2020-06-14 diff --git a/Dockerfile b/Dockerfile index 37d7129..009e240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,17 +25,17 @@ RUN \ virtualenv venv && \ . venv/bin/activate && \ pip install \ - beautifulsoup4~=4.9.0 \ + beautifulsoup4~=4.9.1 \ chardet~=3.0.4 \ - lz4~=3.0.2 \ - numpy~=1.18.2 \ - opencv-python-headless~=4.2.0.34 \ - pillow~=7.1.1 \ - psutil~=5.7.0 \ + lz4~=3.1.0 \ + numpy~=1.19.1 \ + opencv-python-headless~=4.4.0.42 \ + pillow~=7.2.0 \ + psutil~=5.7.2 \ pylzma~=0.5.0 \ pyopenssl~=19.1.0 \ pyyaml~=5.3.1 \ - requests~=2.23.0 \ + requests~=2.24.0 \ send2trash~=1.5.0 \ service_identity~=18.1.0 \ twisted~=20.3.0 && \ From b306857a00a3b4bf9f3235b7d5b9e14dce767c76 Mon Sep 17 00:00:00 2001 From: imtbl Date: Mon, 7 Sep 2020 20:13:19 +0200 Subject: [PATCH 3/3] docs: update changelog for release 3.29.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5e3a72..75e5def 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed +## [3.29.0] - 2020-09-07 + + Updated hydrus server version + Updated dependencies @@ -367,7 +369,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/3.28.0...develop +[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/3.29.0...develop +[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 [3.27.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.26.0...3.27.0 [3.26.0]: https://github.com/imtbl/hydrus-server-docker/compare/3.25.0...3.26.0