From b9cc26694385e51a59e52f1704fca07c7245254b Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Mon, 19 Aug 2019 12:11:59 +0200 Subject: [PATCH 1/3] feat: Decrease Docker image size --- .dockerignore | 12 +++++++++++- CHANGELOG.md | 4 ++++ Dockerfile | 14 ++++---------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6b8710a..0242478 100644 --- a/.dockerignore +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8c56b..a70d5a0 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 + ++ Decreased Docker image size + ## [3.9.0] - 2019-08-08 ### Changed diff --git a/Dockerfile b/Dockerfile index b28e3ab..cbb180e 100644 --- a/Dockerfile +++ b/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 \ From 02c5b1d75f9beecaded2d7a2d44b3c16faae9712 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Mon, 19 Aug 2019 13:00:32 +0200 Subject: [PATCH 2/3] feat: Update hydrus server version --- CHANGELOG.md | 1 + README.md | 8 ++++---- hydrus | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a70d5a0..0c182b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed + Decreased Docker image size ++ Updated hydrus server version ## [3.9.0] - 2019-08-08 diff --git a/README.md b/README.md index ed0d87e..19c18e3 100644 --- a/README.md +++ b/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 diff --git a/hydrus b/hydrus index 144c24e..6041b27 160000 --- a/hydrus +++ b/hydrus @@ -1 +1 @@ -Subproject commit 144c24e93ca79ba549f2e121d8c7f8be51c437b4 +Subproject commit 6041b270359bf6fa03df9759ebe7519f0a80cccd From d173aaf195511c5dbeca07e5c27c39c3dd289417 Mon Sep 17 00:00:00 2001 From: Michael Serajnik Date: Mon, 19 Aug 2019 13:01:39 +0200 Subject: [PATCH 3/3] docs: Update changelog for release 3.10.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c182b6..6836e97 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] +## [3.10.0] - 2019-08-19 + ### Changed + Decreased Docker image size @@ -238,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