From 9f8d208d4891118b1162b066f4afd0d25ce48991 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Sun, 24 Mar 2019 12:42:40 +0100 Subject: [PATCH 1/3] feat: Update hydrus server version --- CHANGELOG.md | 4 ++++ README.md | 8 ++++---- hydrus | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7a8f2c..2479cb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + ++ Updated hydrus server version + ## [2.7.0] - 2019-03-14 ### Changed diff --git a/README.md b/README.md index ee60722..bc70e06 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is a simple Alpine-based Docker setup for running [hydrus server][hydrus-server] from source. -The latest build runs [hydrus server version 343][hydrus-server-version]. +The latest build runs [hydrus server version 344][hydrus-server-version]. ## Table of contents @@ -33,7 +33,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:343 +user@local:~$ docker pull mserajnik/hydrus-server-docker:344 ``` See [here][docker-hub-tags] for all the available version numbers/tags. @@ -152,13 +152,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/v343 +[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v344 [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%20343-blue.svg +[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20344-blue.svg [travis]: https://travis-ci.com/mserajnik/hydrus-server-docker [travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg diff --git a/hydrus b/hydrus index 67e39d8..f7763b3 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 67e39d8f88a080403b73cf1f6b5c423af7dc6243 +Subproject commit f7763b38eea827b7494c8ea2ad54b96f1fcea818 From 14de3dc1b6cdf8f58dd63af08bbcc3dbc4dda467 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Sun, 24 Mar 2019 12:53:53 +0100 Subject: [PATCH 2/3] feat: Add default volume --- CHANGELOG.md | 4 ++++ Dockerfile | 2 ++ README.md | 14 +++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2479cb7..6747f66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + ++ Added default volume + ### Changed + Updated hydrus server version diff --git a/Dockerfile b/Dockerfile index c0e0889..638a5f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,8 @@ HEALTHCHECK --interval=1m --timeout=10s --retries=3 \ CMD wget --quiet --tries=1 --no-check-certificate --spider \ https://localhost:45870 || exit 1 +VOLUME /data + USER hydrus ENTRYPOINT ["docker-entrypoint"] diff --git a/README.md b/README.md index bc70e06..d82a1ec 100644 --- a/README.md +++ b/README.md @@ -95,9 +95,10 @@ repositories. You will generally have two (one for tags and one for files), but if you add more, you will also need to expose additional ports. Per default, hydrus-server-docker stores its databases and media inside the -`/data` directory. It is highly recommended to create a named volume and mount -it to the same location if you wish to persist the data beyond the lifetime of -the container and/or access it on the host: +`/data` directory which is a mount point that is persisted as a volume. A new +volume will be created every time a container is created, making it less ideal +as a long-term solution. Instead, you should create a named volume yourself and +mount that over it instead: ```zsh user@local:~$ docker volume create hydrus-server-data @@ -110,6 +111,13 @@ example with all the options mentioned above: user@local:~$ docker run -p 45870:45870 -p 45871:45871 -p 45872:45872 -v hydrus-server-data:/data -d mserajnik/hydrus-server-docker ``` +Specifying the same named volume every time a container is created gives each +of these instances access to the same persisted data. + +Of course, using a bind mount instead of a named volume is also possible but +for performance reasons only recommended if you need easy access to the data on +the host machine. + ### Additional configuration when building #### UID/GID From a895c631cc7dba26d4321f53777e72b2073ccc36 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Sun, 24 Mar 2019 12:54:47 +0100 Subject: [PATCH 3/3] docs: Update changelog for release 2.8.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6747f66..5ea0c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.8.0] - 2019-03-24 + ### Added + Added default volume @@ -127,7 +129,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/2.7.0...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/2.8.0...develop +[2.8.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.7.0...2.8.0 [2.7.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.6.0...2.7.0 [2.6.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.5.0...2.6.0 [2.5.0]: https://github.com/mserajnik/hydrus-server-docker/compare/2.4.0...2.5.0