From eabac20a8a9f129375f60408d572287522ff27c4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sat, 9 Jun 2018 18:23:50 -0400 Subject: [PATCH 1/3] common.windows: Optimize image size removing MXE sources Suggested-by: Commaster See #181 --- common.windows | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common.windows b/common.windows index da751c9..249be56 100644 --- a/common.windows +++ b/common.windows @@ -91,6 +91,10 @@ RUN \ cd /usr/src/mxe && \ make -j$(nproc) && \ # + # Cleanup: Remove all expect "usr" directory + # + find . -maxdepth 1 -type d \( -path ./usr -o -path ".$" \) -prune -o -print -exec rm -rf {} \; && \ + # # Update MXE toolchain file # echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} && \ From 73e556f06b9ffff4318cf4c83b1cd55d872e24a6 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 11 Jun 2018 09:25:14 -0400 Subject: [PATCH 2/3] common.windows: Better optimization to support package install in derived images --- common.windows | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common.windows b/common.windows index 249be56..6f4633c 100644 --- a/common.windows +++ b/common.windows @@ -91,9 +91,10 @@ RUN \ cd /usr/src/mxe && \ make -j$(nproc) && \ # - # Cleanup: Remove all expect "usr" directory + # Cleanup: By keeping the MXE build system (Makefile, ...), derived images will be able to install + # additional packages. # - find . -maxdepth 1 -type d \( -path ./usr -o -path ".$" \) -prune -o -print -exec rm -rf {} \; && \ + rm -rf .git log pkg && \ # # Update MXE toolchain file # From b5cbd2a8783bce5ed804f66859c4d0e3d8860636 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 11 Jun 2018 17:21:02 -0400 Subject: [PATCH 3/3] common.windows: Only install required packages Suggested-by: Guillaume Jacquenot --- common.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.windows b/common.windows index 6f4633c..c2b2039 100644 --- a/common.windows +++ b/common.windows @@ -27,7 +27,7 @@ ARG DEBIAN_FRONTEND=noninteractive # RUN \ apt-get update && \ - apt-get -y install \ + apt-get install --no-install-recommends --yes \ autoconf \ automake \ autopoint \