From 2b98e4d7a828b4b8100078190bfa83253719b641 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 13 Aug 2018 16:48:13 -0400
Subject: Clean up deletions

---
 Dockerfile       | 17 ++++++++---------
 build_mpdec.sh   |  2 ++
 build_openssl.sh |  7 ++++---
 build_python.sh  |  2 ++
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be91a7d..7a4da8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,15 +29,14 @@ RUN yum install -y \
 COPY build_*.sh /usr/local/bin/
 ENV PATH="/opt/openssl/bin:${PATH}"
 ENV MANPATH="/opt/openssl/share/man:${MANPATH}"
-ENV PKG_CONFIG_PATH="/opt/openssl/lib/pkgconfig:${PKG_CONFIG_PATH}"
+ENV PKG_CONFIG_PATH="/opt/openssl/lib/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
 WORKDIR /builder
-RUN build_openssl.sh && rm -rf /builder/*
-RUN build_mpdec.sh && rm -rf /builder/*
-RUN build_python.sh 3.5.5 && rm -rf /builder/*
-RUN build_python.sh 3.6.6 && rm -rf /builder/*
-RUN build_python.sh 3.7.0 && rm -rf /builder/*
-RUN rm -rf /builder && rm -rf /root/.cache/pip
-
-WORKDIR /
+RUN build_openssl.sh
+RUN build_mpdec.sh
+RUN build_python.sh 3.5.5
+RUN build_python.sh 3.6.6
+RUN build_python.sh 3.7.0
+RUN rm -rf /builder
 
+WORKDIR /root
diff --git a/build_mpdec.sh b/build_mpdec.sh
index 5bae0c2..124833c 100755
--- a/build_mpdec.sh
+++ b/build_mpdec.sh
@@ -27,6 +27,8 @@ function build()
 
 function post()
 {
+    rm -rf "${dest}"
+    rm -rf "${tarball}"
     echo "All done."
 }
 
diff --git a/build_openssl.sh b/build_openssl.sh
index ab951f2..a0fe405 100755
--- a/build_openssl.sh
+++ b/build_openssl.sh
@@ -11,7 +11,6 @@ function pre()
 {
     curl -LO "${url}"
     tar xf "${tarball}"
-    export KERNEL_BITS=64
 }
 
 
@@ -36,9 +35,10 @@ function build()
 {
     pre
     pushd "${dest}"
-        target="linux-x86_64"
+        export KERNEL_BITS=64
         export PATH="$prefix/bin:$PATH"
         export LDFLAGS="-Wl,-rpath=$prefix/lib"
+        target="linux-x86_64"
 
         ./Configure \
             --prefix="$prefix" \
@@ -60,7 +60,8 @@ function post()
 {
     bundle=$(get_system_cacert)
     install -D -m644 "$bundle" "$prefix/ssl/cert.pem"
-    find $prefix
+    rm -rf "${dest}"
+    rm -rf "${tarball}"
     echo "All done."
 }
 
diff --git a/build_python.sh b/build_python.sh
index 4f302bf..50e358c 100755
--- a/build_python.sh
+++ b/build_python.sh
@@ -131,6 +131,8 @@ function post()
     echo '---'
     python --version
     python -c "import sys; from pprint import pprint; pprint(sys.path)"
+    rm -rf "${python_tarball}"
+    rm -rf "${python_source}"
     echo "All done."
 }
 
-- 
cgit