mirror of
https://github.com/imtbl/hydrus-server-docker
synced 2024-09-30 09:17:44 +13:00
Merge branch 'hotfix/1.4.1'
This commit is contained in:
commit
e017bb9dc9
3 changed files with 15 additions and 17 deletions
|
@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.4.1] - 2019-01-13
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
+ Rolled hydrus server version back to 334 due to issues with 335
|
||||||
|
|
||||||
## [1.4.0] - 2019-01-13
|
## [1.4.0] - 2019-01-13
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -52,7 +58,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/1.4.0...develop
|
[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/1.4.1...develop
|
||||||
|
[1.4.1]: https://github.com/mserajnik/hydrus-server-docker/compare/1.4.0...1.4.1
|
||||||
[1.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.3.0...1.4.0
|
[1.4.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.3.0...1.4.0
|
||||||
[1.3.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.2.0...1.3.0
|
[1.3.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.2.0...1.3.0
|
||||||
[1.2.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.1.0...1.2.0
|
[1.2.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.1.0...1.2.0
|
||||||
|
|
|
@ -17,17 +17,14 @@ RUN \
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y ca-certificates curl ffmpeg wget --no-install-recommends && \
|
apt-get install -y ca-certificates ffmpeg wget --no-install-recommends && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
wget "https://www.github.com$( \
|
wget "https://github.com/hydrusnetwork/hydrus/releases/download/v334/Hydrus.Network.334.-.Linux.-.Executable.tar.gz" && \
|
||||||
curl -sL https://github.com/hydrusnetwork/hydrus/releases/latest \
|
|
||||||
| grep 'Linux.-.Executable.tar.gz' \
|
|
||||||
| sed -n 's/.*href="\([^"]*\).*/\1/p')" && \
|
|
||||||
tar zxvf $(ls | grep "Linux.-.Executable.tar.gz") --strip-components 1 && \
|
tar zxvf $(ls | grep "Linux.-.Executable.tar.gz") --strip-components 1 && \
|
||||||
rm $(ls | grep "Linux.-.Executable.tar.gz") && \
|
rm $(ls | grep "Linux.-.Executable.tar.gz") && \
|
||||||
chown -R hydrus:hydrus /usr/src/app && \
|
chown -R hydrus:hydrus /usr/src/app && \
|
||||||
mkdir /data && chown -R hydrus:hydrus /data && \
|
mkdir /data && chown -R hydrus:hydrus /data && \
|
||||||
apt-get remove ca-certificates curl wget -y && \
|
apt-get remove ca-certificates wget -y && \
|
||||||
apt-get autoremove -y
|
apt-get autoremove -y
|
||||||
|
|
||||||
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
|
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
|
||||||
|
|
14
README.md
14
README.md
|
@ -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
|
run hydrus server together with [hydrusrv][hydrusrv], but can of course also be
|
||||||
used on its own.
|
used on its own.
|
||||||
|
|
||||||
The latest build runs [hydrus server version 335][hydrus-server-version].
|
The latest build runs [hydrus server version 334][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:335
|
user@local:~$ docker pull mserajnik/hydrus-server-docker:334
|
||||||
```
|
```
|
||||||
|
|
||||||
See [here][docker-hub-tags] for all the available version numbers/tags.
|
See [here][docker-hub-tags] for all the available version numbers/tags.
|
||||||
|
@ -116,12 +116,6 @@ host.
|
||||||
|
|
||||||
+ The image also includes the hydrus client due to the compiled releases always
|
+ The image also includes the hydrus client due to the compiled releases always
|
||||||
including both it and the server. This adds quite a bit of size to the image.
|
including both it and the server. This adds quite a bit of size to the image.
|
||||||
+ To upgrade hydrus server to a new version, you need to either make a new
|
|
||||||
build yourself (when using `--no-cache` it will automatically download the
|
|
||||||
latest version of hydrus server), upgrade it directly inside the running
|
|
||||||
container or wait until I make a new release. I will try to keep up with
|
|
||||||
every new hydrus release (usually weekly on Wednesdays), but cannot make any
|
|
||||||
promises.
|
|
||||||
|
|
||||||
## Donate
|
## Donate
|
||||||
|
|
||||||
|
@ -153,13 +147,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/v335
|
[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v334
|
||||||
[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%20335-blue.svg
|
[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20334-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
|
||||||
|
|
Loading…
Reference in a new issue