CodeMirror/hydrus-server-docker
1
0
Fork 0
mirror of https://github.com/imtbl/hydrus-server-docker synced 2024-05-15 18:13:19 +12:00
Code Issues Releases Wiki Activity

Merge branch 'release/3.18.0'

Browse source
This commit is contained in:
Michael Serajnik 2019-11-14 10:56:52 +01:00
parent d86f9eeb2a b1bf032514
commit 7099ab02e3
No known key found for this signature in database
GPG key ID: B390A5CBA3ECB74D
4 changed files with 17 additions and 10 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.18.0] - 2019-11-14
### Changed
+ Updated hydrus server version
## [3.17.0] - 2019-10-16
### Changed
@ -282,7 +288,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.17.0...develop
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.18.0...develop
[3.18.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.17.0...3.18.0
[3.17.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.16.0...3.17.0
[3.16.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.15.0...3.16.0
[3.15.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.14.0...3.15.0

8
Dockerfile
View file

@ -42,17 +42,17 @@ RUN \
beautifulsoup4~=4.8.1 \
chardet~=3.0.4 \
lz4~=2.2.1 \
numpy~=1.17.2 \
numpy~=1.17.4 \
opencv-python-headless~=4.1.1.26 \
pillow~=6.2.0 \
psutil~=5.6.3 \
pillow~=6.2.1 \
psutil~=5.6.5 \
pylzma~=0.5.0 \
pyopenssl~=19.0.0 \
pyyaml~=5.1.2 \
requests~=2.22.0 \
send2trash~=1.5.0 \
service_identity~=18.1.0 \
twisted~=19.7.0 && \
twisted~=19.10.0 && \
rm -r ~/.cache && \
apt-get remove build-essential --purge -y && \
apt-get clean && apt-get autoremove --purge -y && \

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 372][hydrus-server-version].
The latest build runs [hydrus server version 373][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:372
user@local:~$ docker pull mserajnik/hydrus-server-docker:373
```
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/v372
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v373
[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%20372-blue.svg
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20373-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 a04a5c271c21f272215cd5a127f82b90ac261e70
Subproject commit 69019f844f29a4e06f8d7c7097aba0b7bbeb80bf