Merge branch 'release/3.10.0'

.dockerignore

@@ -1 +1,11 @@
-.git
+**/.git
+**/*.md
+**/*.sql
+**/*.txt
+**/COPYING
+/hydrus/bin/swfrender_osx
+/hydrus/bin/swfrender_win32.exe
+/hydrus/bin/upnpc_osx
+/hydrus/bin/upnpc_win32.exe
+/hydrus/db
+/hydrus/help

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.10.0] - 2019-08-19
+
+### Changed
+
++ Decreased Docker image size
++ Updated hydrus server version
+
 ## [3.9.0] - 2019-08-08
 
 ### Changed
@@ -233,7 +240,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/3.9.0...develop
+[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/3.10.0...develop
+[3.10.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.9.0...3.10.0
 [3.9.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.8.0...3.9.0
 [3.8.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.7.0...3.8.0
 [3.7.0]: https://github.com/mserajnik/hydrus-server-docker/compare/3.6.0...3.7.0

Dockerfile

@@ -25,14 +25,9 @@ RUN \
     server.py \
     bin/swfrender_linux \
     bin/upnpc_linux && \
-  rm \
-    bin/swfrender_osx \
-    bin/swfrender_win32.exe \
-    bin/upnpc_osx \
-    bin/upnpc_win32.exe && \
   mkdir /data && \
   chown -R hydrus:hydrus /data && \
-  apt-get update && apt-get install -y \
+  apt-get update && apt-get install --no-install-recommends -y \
     build-essential \
     ffmpeg \
     multiarch-support \
@@ -59,15 +54,14 @@ RUN \
     service_identity~=18.1.0 \
     twisted~=19.2.1 && \
   rm -r ~/.cache && \
-  apt-get clean && apt-get autoclean && apt-get autoremove --purge -y && \
+  apt-get remove build-essential --purge -y && \
+  apt-get clean && apt-get autoremove --purge -y && \
   rm -rf /var/lib/apt/lists/*
 
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
 
-EXPOSE 45870/tcp
-EXPOSE 45871/tcp
-EXPOSE 45872/tcp
+EXPOSE 45870/tcp 45871/tcp 45872/tcp
 
 HEALTHCHECK --interval=1m --timeout=10s --retries=3 \
   CMD wget --quiet --tries=1 --no-check-certificate --spider \

README.md

@@ -5,7 +5,7 @@
 This is a simple Debian-based Docker setup for running
 [hydrus server][hydrus-server] from source.
 
-The latest build runs [hydrus server version 363][hydrus-server-version].
+The latest build runs [hydrus server version 364][hydrus-server-version].
 
 ## Table of contents
 
@@ -34,7 +34,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:363
+user@local:~$ docker pull mserajnik/hydrus-server-docker:364
 ```
 
 See [here][docker-hub-tags] for all the available version numbers/tags.
@@ -169,13 +169,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/v363
+[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v364
 [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%20363-blue.svg
+[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20364-blue.svg
 
 [travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
 [travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg

hydrus

@@ -1 +1 @@
-Subproject commit 144c24e93ca79ba549f2e121d8c7f8be51c437b4
+Subproject commit 6041b270359bf6fa03df9759ebe7519f0a80cccd