1
0
Fork 0
mirror of https://github.com/imtbl/hydrus-server-docker synced 2024-04-29 18:23:38 +12:00

Merge branch 'release/3.29.0' into master

This commit is contained in:
imtbl 2020-09-07 20:13:27 +02:00
commit 49ef4e8d08
No known key found for this signature in database
GPG key ID: 1E0CA1EF5FCB6B36
4 changed files with 21 additions and 13 deletions

View file

@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
### Changed
## [3.29.0] - 2020-09-07
+ Updated hydrus server version
+ Updated dependencies
## [3.28.0] - 2020-06-14
### Changed
@ -362,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

View file

@ -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 && \

View file

@ -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

2
hydrus

@ -1 +1 @@
Subproject commit d7a0876b431f027238379f2bb4cfd403794a6eb2
Subproject commit b1089fcc730ba993afafb3313fb8447b79049a51