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 \