From 97e332cecb816b29e8148a536365c8759aa9c01f Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 2 Jan 2020 04:34:25 +0100 Subject: [PATCH 1/4] chore: update dependencies --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca50798..3ba0cb7 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 dependencies + ## [3.20.0] - 2019-12-20 ### Changed From e3e0d2ad49bc091a6a8581ca742a3f6e05beb307 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 2 Jan 2020 04:47:12 +0100 Subject: [PATCH 2/4] feat: update hydrus server version --- CHANGELOG.md | 1 + Dockerfile | 6 +++--- README.md | 8 ++++---- hydrus | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ba0cb7..8180f56 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 dependencies ++ Updated hydrus server version ## [3.20.0] - 2019-12-20 diff --git a/Dockerfile b/Dockerfile index 2976b95..44893d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,10 +39,10 @@ RUN \ virtualenv venv && \ . venv/bin/activate && \ pip install \ - beautifulsoup4~=4.8.1 \ + beautifulsoup4~=4.8.2 \ chardet~=3.0.4 \ - lz4~=2.2.1 \ - numpy~=1.17.4 \ + lz4~=3.0.2 \ + numpy~=1.18.0 \ opencv-python-headless~=4.1.2.30 \ pillow~=6.2.1 \ psutil~=5.6.7 \ diff --git a/README.md b/README.md index ba8d213..d2b5fa4 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 378][hydrus-server-version]. +The latest build runs [hydrus server version 379][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:378 +user@local:~$ docker pull mserajnik/hydrus-server-docker:379 ``` 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/v378 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v379 [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%20378-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20379-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 77326ca..1f2f058 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 77326caeb993ec7fb79b372550f6facd056986ff +Subproject commit 1f2f058a9cb30447637383af27ecf7b20b0f90f2 From 20ad65cbe880314cdd93d7a6688a826138aadf6b Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 2 Jan 2020 04:51:04 +0100 Subject: [PATCH 3/4] chore: update copyright --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index dc2c737..d33f341 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019 Michael Serajnik +Copyright (c) 2018-present Michael Serajnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 44785f1ddf09888a36e6ac71b3c60d9b4ab96118 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Thu, 2 Jan 2020 04:52:47 +0100 Subject: [PATCH 4/4] docs: update changelog for release 3.21.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8180f56..b44be30 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.21.0] - 2020-01-02 + ### Changed + Updated dependencies @@ -306,7 +308,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.20.0...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.21.0...develop +[3.21.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.20.0...3.21.0 [3.20.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.19.0...3.20.0 [3.19.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.18.0...3.19.0 [3.18.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.17.0...3.18.0