mirror of
https://github.com/imtbl/hydrus-server-docker
synced 2024-05-16 02:23:32 +12:00
Merge branch 'release/1.2.0'
This commit is contained in:
commit
07be54dc4b
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]
|
||||
|
||||
## [1.2.0] - 2018-12-06
|
||||
|
||||
### Changed
|
||||
|
||||
+ Updated hydrus server version
|
||||
+ Reduced image size
|
||||
|
||||
## [1.1.0] - 2018-12-02
|
||||
|
||||
### Changed
|
||||
|
@ -33,7 +40,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/1.1.0...develop
|
||||
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/1.2.0...develop
|
||||
[1.2.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.1.0...1.2.0
|
||||
[1.1.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.0.2...1.1.0
|
||||
[1.0.2]: https://github.com/mserajnik/hydrus-server-docker/compare/1.0.1...1.0.2
|
||||
[1.0.1]: https://github.com/mserajnik/hydrus-server-docker/compare/1.0.0...1.0.1
|
||||
|
|
|
@ -27,7 +27,8 @@ RUN apt-get update && \
|
|||
rm $(ls | grep "Linux.-.Executable.tar.gz") && \
|
||||
chown -R hydrus:hydrus /usr/src/app && \
|
||||
mkdir /data && chown -R hydrus:hydrus /data && \
|
||||
apt-get remove ca-certificates curl wget -y
|
||||
apt-get remove ca-certificates curl wget -y && \
|
||||
apt-get autoremove -y
|
||||
|
||||
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint
|
||||
|
|
|
@ -7,7 +7,7 @@ This is a simple Debian-based Docker setup for running the compiled version of
|
|||
run hydrus server together with [hydrusrv][hydrusrv], but can of course also be
|
||||
used on its own.
|
||||
|
||||
The latest build runs [hydrus server version 332][hydrus-server-version].
|
||||
The latest build runs [hydrus server version 333][hydrus-server-version].
|
||||
|
||||
## 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.:
|
||||
|
||||
```zsh
|
||||
user@local:~$ docker pull mserajnik/hydrus-server-docker:332
|
||||
user@local:~$ docker pull mserajnik/hydrus-server-docker:333
|
||||
```
|
||||
|
||||
See [here][docker-hub-tags] for all the available version numbers/tags.
|
||||
|
@ -153,13 +153,13 @@ You are welcome to help out!
|
|||
|
||||
[hydrus-server]: http://hydrusnetwork.github.io/hydrus/
|
||||
[hydrusrv]: https://github.com/mserajnik/hydrusrv
|
||||
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v332
|
||||
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v333
|
||||
[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%20332-blue.svg
|
||||
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20333-blue.svg
|
||||
|
||||
[travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
|
||||
[travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/bash
|
||||
|
||||
stop_server() {
|
||||
stop() {
|
||||
./server stop -d="/data"
|
||||
}
|
||||
|
||||
trap "stop_server" SIGTERM
|
||||
trap "stop" SIGTERM
|
||||
|
||||
./server -d="/data" &
|
||||
|
||||
|
|
Loading…
Reference in a new issue