mirror of
https://github.com/imtbl/hydrus-server-docker
synced 2024-06-29 11:40:33 +12:00
Merge branch 'release/2.5.0'
This commit is contained in:
commit
52df8fefe9
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [2.5.0] - 2019-03-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
+ Added container healthchecks
|
||||||
|
+ Updated hydrus server version
|
||||||
|
|
||||||
## [2.4.0] - 2019-02-15
|
## [2.4.0] - 2019-02-15
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -100,7 +107,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/2.4.0...develop
|
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/2.5.0...develop
|
||||||
|
[2.5.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.4.0...2.5.0
|
||||||
[2.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.3.1...2.4.0
|
[2.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.3.1...2.4.0
|
||||||
[2.3.1]: https://github.com/mserajnik/hydrus-server-docker/compare/2.3.0...2.3.1
|
[2.3.1]: https://github.com/mserajnik/hydrus-server-docker/compare/2.3.0...2.3.1
|
||||||
[2.3.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.2.0...2.3.0
|
[2.3.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.2.0...2.3.0
|
||||||
|
|
|
@ -43,7 +43,7 @@ RUN \
|
||||||
pip install \
|
pip install \
|
||||||
beautifulsoup4~=4.7.1 \
|
beautifulsoup4~=4.7.1 \
|
||||||
lz4~=2.1.6 \
|
lz4~=2.1.6 \
|
||||||
numpy~=1.16.1 \
|
numpy~=1.16.2 \
|
||||||
pillow~=5.4.1 \
|
pillow~=5.4.1 \
|
||||||
psutil~=5.4.8 \
|
psutil~=5.4.8 \
|
||||||
pylzma~=0.5.0 \
|
pylzma~=0.5.0 \
|
||||||
|
@ -63,6 +63,10 @@ EXPOSE 45870/tcp
|
||||||
EXPOSE 45871/tcp
|
EXPOSE 45871/tcp
|
||||||
EXPOSE 45872/tcp
|
EXPOSE 45872/tcp
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=1m --timeout=10s --retries=3 \
|
||||||
|
CMD wget --quiet --tries=1 --no-check-certificate --spider \
|
||||||
|
https://localhost:45870 || exit 1
|
||||||
|
|
||||||
USER hydrus
|
USER hydrus
|
||||||
|
|
||||||
ENTRYPOINT ["docker-entrypoint"]
|
ENTRYPOINT ["docker-entrypoint"]
|
||||||
|
|
|
@ -7,7 +7,7 @@ This is a simple Alpine-based Docker setup for running
|
||||||
easier to run hydrus server together with [hydrusrv][hydrusrv], but can of
|
easier to run hydrus server together with [hydrusrv][hydrusrv], but can of
|
||||||
course also be used on its own.
|
course also be used on its own.
|
||||||
|
|
||||||
The latest build runs [hydrus server version 340][hydrus-server-version].
|
The latest build runs [hydrus server version 341][hydrus-server-version].
|
||||||
|
|
||||||
## Table of contents
|
## Table of contents
|
||||||
|
|
||||||
|
@ -35,7 +35,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:340
|
user@local:~$ docker pull mserajnik/hydrus-server-docker:341
|
||||||
```
|
```
|
||||||
|
|
||||||
See [here][docker-hub-tags] for all the available version numbers/tags.
|
See [here][docker-hub-tags] for all the available version numbers/tags.
|
||||||
|
@ -155,13 +155,13 @@ You are welcome to help out!
|
||||||
|
|
||||||
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/
|
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/
|
||||||
[hydrusrv]: https://github.com/mserajnik/hydrusrv
|
[hydrusrv]: https://github.com/mserajnik/hydrusrv
|
||||||
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v340
|
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v341
|
||||||
[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%20340-blue.svg
|
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20341-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
2
hydrus
|
@ -1 +1 @@
|
||||||
Subproject commit 0f516b23aa0cb5945e3e54d4b488f30e8238613d
|
Subproject commit 4b6fc54a4c88740baded7905f3528f67ea318735
|
Loading…
Reference in a new issue