diff --git a/CHANGELOG.md b/CHANGELOG.md index 13dc095..ca67512 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.1.0] - 2018-12-02 + +### Changed + ++ Reduced image size ++ Changed terminology (for aesthetic reasons) + ## [1.0.2] - 2018-11-30 ### Fixed @@ -26,6 +33,7 @@ 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.0.2...develop +[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/1.1.0...develop +[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 diff --git a/Dockerfile b/Dockerfile index 8d78dc8..2b5f29b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -FROM debian:stretch - -RUN apt-get update && apt-get install -y ffmpeg curl wget +FROM debian:stretch-slim ARG HOST_USER_ID=1000 ARG HOST_GROUP_ID=1000 @@ -18,16 +16,18 @@ RUN \ WORKDIR /usr/src/app -RUN wget "https://www.github.com$( \ +RUN apt-get update && \ + apt-get install -y ca-certificates curl ffmpeg wget --no-install-recommends && \ + rm -rf /var/lib/apt/lists/* && \ + wget "https://www.github.com$( \ curl -sL https://github.com/hydrusnetwork/hydrus/releases/latest \ | grep 'Linux.-.Executable.tar.gz' \ - | sed -n 's/.*href="\([^"]*\).*/\1/p')" - -RUN tar zxvf $(ls | grep "Linux.-.Executable.tar.gz") --strip-components 1 -RUN rm $(ls | grep "Linux.-.Executable.tar.gz") \ - && chown -R hydrus:hydrus /usr/src/app - -RUN mkdir /data && chown -R hydrus:hydrus /data + | sed -n 's/.*href="\([^"]*\).*/\1/p')" && \ + tar zxvf $(ls | grep "Linux.-.Executable.tar.gz") --strip-components 1 && \ + 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 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint RUN chmod +x /usr/local/bin/docker-entrypoint diff --git a/README.md b/README.md index da4a418..8861f9e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # hydrus-server-docker [![hydrus server version][hydrus-server-badge]][hydrus-server-version] [![Build status][travis-badge]][travis] [![Docker Hub build][docker-hub-badge]][docker-hub] -> Built version of [hydrus server][hydrus-server] running on Debian +> Compiled version of [hydrus server][hydrus-server] running on Debian -This is a simple Debian-based Docker setup for running the built version of +This is a simple Debian-based Docker setup for running the compiled version of [hydrus server][hydrus-server]. It was mainly created for making it easier to run hydrus server together with [hydrusrv][hydrusrv], but can of course also be used on its own. @@ -114,9 +114,8 @@ host. ## Caveats -+ The built image also includes the hydrus client due to the built releases - always including both it and the server. This adds quite a bit of size to the - image. ++ 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. + 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