Merge pull request #10 from asottile/improve_size

improve size by not having tgz in the image

Author: asottile

build.sh

@@ -4,5 +4,4 @@
 set -ex
 
 TAG=pypywheels/manylinux2010-pypy_x86_64
-docker/build_scripts_pypy/prefetch_pypy.sh
 docker build --rm -t $TAG:latest -f docker/Dockerfile-x86_64 docker/

docker/Dockerfile-x86_64

@@ -1,9 +1,11 @@
 FROM quay.io/pypa/manylinux2010_x86_64
 LABEL maintainer="Antonio Cuni"
 
-COPY sources /
 COPY build_scripts /build_scripts
 COPY build_scripts_pypy /build_scripts_pypy
-RUN bash build_scripts_pypy/install_pypy.sh && rm -rf build_scripts*
+RUN : \
+    && build_scripts_pypy/prefetch_pypy.sh \
+    && build_scripts_pypy/install_pypy.sh \
+    && rm -rf /sources /build_scripts*
 
 CMD ["/bin/bash"]

docker/build_scripts_pypy/install_pypy.sh

@@ -47,7 +47,7 @@ function install_one_pypy {
     ln -s /opt/pypy/$shortdir /opt/python/${abi_tag}
 }
 
-for TARBALL in /pypy*.tar.bz2
+for TARBALL in /sources/pypy*.tar.bz2
 do
     install_one_pypy "$TARBALL"
     rm "$TARBALL"

docker/build_scripts_pypy/prefetch_pypy.sh

@@ -2,15 +2,15 @@
 
 set -ex
 
-SOURCES=docker/sources
+SOURCES=/sources
 SQUEAKY_GITHUB_URL=https://github.com/squeaky-pl/portable-pypy/releases/download # old releases
 URL=https://downloads.python.org/pypy # new releases
 
 
 MY_DIR=$(dirname "${BASH_SOURCE[0]}")
 . $MY_DIR/../build_scripts/build_utils.sh
 
-[ -d "$SOURCES" ] || mkdir "$SOURCES"
+mkdir -p "$SOURCES"
 cd "$SOURCES"
 
 # pypy 7.2.0