CodeMirror/hydrus-server-docker
1
0
Fork 0
mirror of https://github.com/imtbl/hydrus-server-docker synced 2024-06-10 22:54:52 +12:00
Code Issues Releases Wiki Activity

Merge branch 'release/3.21.0'

Browse source
This commit is contained in:
Michael Serajnik 2020-01-02 04:53:03 +01:00
parent 51a2832d3d 44785f1ddf
commit 32494f6c97
No known key found for this signature in database
GPG key ID: B390A5CBA3ECB74D
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
## [3.21.0] - 2020-01-02
### Changed
+ Updated dependencies
+ Updated hydrus server version
## [3.20.0] - 2019-12-20 ## [3.20.0] - 2019-12-20
### Changed ### Changed
@ -301,7 +308,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
+ Initial release + 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.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.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 [3.18.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.17.0...3.18.0

6
Dockerfile
View file

@ -39,10 +39,10 @@ RUN \
virtualenv venv && \ virtualenv venv && \
. venv/bin/activate && \ . venv/bin/activate && \
pip install \ pip install \
beautifulsoup4~=4.8.1 \ beautifulsoup4~=4.8.2 \
chardet~=3.0.4 \ chardet~=3.0.4 \
lz4~=2.2.1 \ lz4~=3.0.2 \
numpy~=1.17.4 \ numpy~=1.18.0 \
opencv-python-headless~=4.1.2.30 \ opencv-python-headless~=4.1.2.30 \
pillow~=6.2.1 \ pillow~=6.2.1 \
psutil~=5.6.7 \ psutil~=5.6.7 \

2
LICENSE.md
View file

@ -1,6 +1,6 @@
# MIT License # 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

8
README.md
View file

@ -5,7 +5,7 @@
This is a simple Debian-based Docker setup for running This is a simple Debian-based Docker setup for running
[hydrus server][hydrus-server] from source. [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 ## 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.: specific version of hydrus server, provide the version number as tag, e.g.:
```zsh ```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. 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 [MIT](LICENSE.md) © Michael Serajnik
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/ [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]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/
[docker-hub-tags]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/tags/ [docker-hub-tags]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/tags/
[docker]: https://www.docker.com/ [docker]: https://www.docker.com/
[semantic-versioning]: https://semver.org/ [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]: https://travis-ci.com/mserajnik/hydrus-server-docker
[travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg [travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg

2
hydrus

@ -1 +1 @@
Subproject commit 77326caeb993ec7fb79b372550f6facd056986ff Subproject commit 1f2f058a9cb30447637383af27ecf7b20b0f90f2