GUACAMOLE-407: Restrict runtime dependencies to only those libraries which are actually linked.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/554d3209 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/554d3209 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/554d3209 Branch: refs/heads/master Commit: 554d3209db73fbe70b5b4f33e1828e9251c59b7e Parents: 72638aa Author: Michael Jumper <mjum...@apache.org> Authored: Thu Feb 8 15:10:01 2018 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Sun Apr 1 21:16:38 2018 -0700 ---------------------------------------------------------------------- Dockerfile | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/554d3209/Dockerfile ---------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 3e55dc1..e2e632d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,11 +94,9 @@ ARG RUNTIME_DEPENDENCIES=" \ libfreerdp-common1.1.0 \ libfreerdp-core1.1 \ libfreerdp-crypto1.1 \ - libfreerdp-gdi1.1 \ libfreerdp-locale1.1 \ - libfreerdp-plugins-standard \ libfreerdp-primitives1.1 \ - libfreerdp-rail1.1 \ + libfreerdp-plugins-standard \ libfreerdp-utils1.1 \ libjpeg-turbo8 \ libossp-uuid16 \ @@ -109,36 +107,24 @@ ARG RUNTIME_DEPENDENCIES=" \ libtelnet2 \ libvncclient1 \ libwebp5 \ - libwinpr-asn1-0.1 \ - libwinpr-bcrypt0.1 \ - libwinpr-credentials0.1 \ - libwinpr-credui0.1 \ libwinpr-crt0.1 \ - libwinpr-crypto0.1 \ libwinpr-dsparse0.1 \ libwinpr-environment0.1 \ - libwinpr-error0.1 \ libwinpr-file0.1 \ libwinpr-handle0.1 \ libwinpr-heap0.1 \ libwinpr-input0.1 \ libwinpr-interlocked0.1 \ - libwinpr-io0.1 \ libwinpr-library0.1 \ libwinpr-path0.1 \ - libwinpr-pipe0.1 \ libwinpr-pool0.1 \ libwinpr-registry0.1 \ libwinpr-rpc0.1 \ libwinpr-sspi0.1 \ - libwinpr-sspicli0.1 \ libwinpr-synch0.1 \ libwinpr-sysinfo0.1 \ libwinpr-thread0.1 \ - libwinpr-timezone0.1 \ libwinpr-utils0.1 \ - libwinpr-winhttp0.1 \ - libwinpr-winsock0.1 \ xfonts-terminus" # Bring runtime environment up to date and install runtime dependencies @@ -151,7 +137,7 @@ COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR} # Link FreeRDP plugins into proper path RUN FREERDP_DIR=$(dirname \ - $(dpkg-query -L libfreerdp | grep 'libfreerdp.*\.so' | head -n1)) && \ + $(dpkg-query -L libfreerdp-client1.1 | grep 'libfreerdp.*\.so' | head -n1)) && \ FREERDP_PLUGIN_DIR="${FREERDP_DIR}/freerdp" && \ mkdir -p "$FREERDP_PLUGIN_DIR" && \ ln -s "$PREFIX_DIR"/lib/freerdp/*.so "$FREERDP_PLUGIN_DIR"
