From 194b7064ec36eb2b12f542db6b8171e554c19707 Mon Sep 17 00:00:00 2001
From: Michael Serajnik <ms@mserajnik.at>
Date: Wed, 5 Dec 2018 23:54:07 +0100
Subject: [PATCH 1/3] feat: Update hydrus server version

---
 CHANGELOG.md         | 4 ++++
 README.md            | 8 ++++----
 docker-entrypoint.sh | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca67512..9c173ed 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
+
 ## [1.1.0] - 2018-12-02
 
 ### Changed
diff --git a/README.md b/README.md
index 8861f9e..0710937 100644
--- a/README.md
+++ b/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
 used on its own.
 
-The latest build runs [hydrus server version 332][hydrus-server-version].
+The latest build runs [hydrus server version 333][hydrus-server-version].
 
 ## 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.:
 
 ```zsh
-user@local:~$ docker pull mserajnik/hydrus-server-docker:332
+user@local:~$ docker pull mserajnik/hydrus-server-docker:333
 ```
 
 See [here][docker-hub-tags] for all the available version numbers/tags.
@@ -153,13 +153,13 @@ You are welcome to help out!
 
 [hydrus-server]: http://hydrusnetwork.github.io/hydrus/
 [hydrusrv]: https://github.com/mserajnik/hydrusrv
-[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v332
+[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v333
 [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%20332-blue.svg
+[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20333-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/docker-entrypoint.sh b/docker-entrypoint.sh
index 84d79c0..5a4b511 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-stop_server() {
+stop() {
   ./server stop -d="/data"
 }
 
-trap "stop_server" SIGTERM
+trap "stop" SIGTERM
 
 ./server -d="/data" &
 

From ceba00c61a8e1ca46f9453646000f8a0a44c76f5 Mon Sep 17 00:00:00 2001
From: Michael Serajnik <ms@mserajnik.at>
Date: Wed, 5 Dec 2018 23:57:50 +0100
Subject: [PATCH 2/3] feat: Reduce image size

---
 CHANGELOG.md | 1 +
 Dockerfile   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c173ed..e533c14 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
 
 + Updated hydrus server version
++ Reduced image size
 
 ## [1.1.0] - 2018-12-02
 
diff --git a/Dockerfile b/Dockerfile
index 2b5f29b..c640649 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,8 @@ RUN apt-get update && \
   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
+  apt-get remove ca-certificates curl wget -y && \
+  apt-get autoremove -y
 
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint

From 7098a911d85b6fd09750f9d32458e28c1f789bb0 Mon Sep 17 00:00:00 2001
From: Michael Serajnik <ms@mserajnik.at>
Date: Thu, 6 Dec 2018 00:05:18 +0100
Subject: [PATCH 3/3] docs: Update changelog for release 1.2.0

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e533c14..1c03461 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]
 
+## [1.2.0] - 2018-12-06
+
 ### Changed
 
 + Updated hydrus server version
@@ -38,7 +40,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/1.1.0...develop
+[Unreleased]: https://github.com/mserajnik/hydrus-server-docker/compare/1.2.0...develop
+[1.2.0]: https://github.com/mserajnik/hydrus-server-docker/compare/1.1.0...1.2.0
 [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