CodeMirror/hydrus-server-docker
1
0
Fork 0
mirror of https://github.com/imtbl/hydrus-server-docker synced 2024-05-17 02:53:21 +12:00
Code Issues Releases Wiki Activity

Merge branch 'release/3.15.0'

Browse source
This commit is contained in:
Michael Serajnik 2019-10-08 19:30:00 +02:00
parent d408f07e18 a0c182135e
commit 98045602a3
No known key found for this signature in database
GPG key ID: B390A5CBA3ECB74D
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -7,6 +7,12 @@ 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
## [3.14.0] - 2019-09-29
### Changed
@ -264,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

4
Dockerfile
View file

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

8
README.md
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 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

2
hydrus

@ -1 +1 @@
Subproject commit 9e0dfd542aada3fec17dfcc3d982a6a5a02e1546
Subproject commit 8d75db00f5c68cba0a5064d27834baa83c4c8644