From 3d11cd90f965bd9f45e6e530f240cb2fe6dd0dd0 Mon Sep 17 00:00:00 2001 From: imtbl Date: Thu, 21 Jan 2021 17:51:36 +0100 Subject: [PATCH 1/4] 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 ebac236..28a915b 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.2.0] - 2020-12-09 ### Changed diff --git a/README.md b/README.md index 78332e0..46bf57e 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 421][hydrus-server-version]. +The latest build runs [hydrus server version 426][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:421 +user@local:~$ docker pull mtbl/hydrus-server-docker:426 ``` 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/v421 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v426 [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%20421-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20426-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 c3100f7..1acdc25 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit c3100f7a881b8a8b9ab4dd238d2696500c343d45 +Subproject commit 1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2 From 22c4f77680dc697379244f9945c540029f8fbe95 Mon Sep 17 00:00:00 2001 From: imtbl Date: Thu, 21 Jan 2021 17:54:17 +0100 Subject: [PATCH 2/4] chore: update dependencies --- CHANGELOG.md | 1 + Dockerfile | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a915b..56de91f 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.2.0] - 2020-12-09 diff --git a/Dockerfile b/Dockerfile index 016c587..c821c44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,16 +42,16 @@ RUN \ . venv/bin/activate && \ pip install \ beautifulsoup4~=4.9.3 \ - chardet~=3.0.4 \ - lz4~=3.1.1 \ - numpy~=1.19.4 \ - opencv-python-headless~=4.4.0.46 \ - pillow~=8.0.1 \ - psutil~=5.7.3 \ + chardet~=4.0.0 \ + lz4~=3.1.3 \ + numpy~=1.19.5 \ + opencv-python-headless~=4.5.1.48 \ + pillow~=8.1.0 \ + psutil~=5.8.0 \ pylzma~=0.5.0 \ - pyopenssl~=20.0.0 \ - pyyaml~=5.3.1 \ - requests~=2.25.0 \ + pyopenssl~=20.0.1 \ + pyyaml~=5.4.1 \ + requests~=2.25.1 \ send2trash~=1.5.0 \ service_identity~=18.1.0 \ twisted~=20.3.0 && \ From 37fe944b15bc4d1dd8cf20519dabc957a1676d2b Mon Sep 17 00:00:00 2001 From: imtbl Date: Thu, 21 Jan 2021 17:58:16 +0100 Subject: [PATCH 3/4] chore: remove reference to miniupnpc --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c821c44..8c8887c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,8 +62,7 @@ RUN \ chown -R ${USER_ID}:${GROUP_ID} /usr/src/app && \ chmod +x \ server.py \ - bin/swfrender_linux \ - bin/upnpc_linux && \ + bin/swfrender_linux && \ mkdir /data && chown -R ${USER_ID}:${GROUP_ID} /data COPY docker-cmd-start.sh /usr/local/bin/start From 651676c929dbb1cbd13b4f07dff6ef0d30a3f1aa Mon Sep 17 00:00:00 2001 From: imtbl Date: Thu, 21 Jan 2021 18:03:24 +0100 Subject: [PATCH 4/4] docs: update changelog for release 4.3.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56de91f..977f91a 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.3.0] - 2021-01-21 + ### Changed + Updated hydrus server version @@ -397,7 +399,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.2.0...develop +[Unreleased]: https://github.com/imtbl/hydrus-server-docker/compare/4.3.0...develop +[4.3.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.2.0...4.3.0 [4.2.0]: https://github.com/imtbl/hydrus-server-docker/compare/4.1.0...4.2.0 [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