diff options
| author | Abhishek Arya <inferno@chromium.org> | 2020-05-27 20:48:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 20:48:51 -0700 |
| commit | 37fbb75094f376001580a8138f6bc59849d11726 (patch) | |
| tree | 369a3234d2bc20312b958623b9ca13656bdb3588 /infra/base-images/base-builder | |
| parent | 3181066c06b6f9559635c6e496d6f1cf63409e56 (diff) | |
| download | oss-fuzz-37fbb75094f376001580a8138f6bc59849d11726.tar.gz | |
Set up python in one docker layer, remove python deps. (#3893)
* Set up python in one docker layer.
Address review comment in https://github.com/google/oss-fuzz/pull/3890#pullrequestreview-419693856
* Remove all python dependencies, keep build-essential.
Diffstat (limited to 'infra/base-images/base-builder')
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index f28548f3c..7e850095d 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -22,18 +22,17 @@ RUN apt-get update && \ apt-get update && \ apt-get install -y \ binutils-dev \ + build-essential \ curl \ git \ jq \ libc6-dev-i386 \ - make \ subversion \ zip # Build and install latest Python 3 (3.8.3). ENV PYTHON_VERSION 3.8.3 -RUN apt-get install -y \ - build-essential \ +RUN export PYTHON_DEPS="\ zlib1g-dev \ libncurses5-dev \ libgdbm-dev \ @@ -43,8 +42,9 @@ RUN apt-get install -y \ libreadline-dev \ libffi-dev \ libbz2-dev \ - liblzma-dev -RUN cd /tmp/ && \ + liblzma-dev" && \ + apt-get install -y $PYTHON_DEPS && \ + cd /tmp/ && \ curl -O https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz && \ tar -xvf Python-$PYTHON_VERSION.tar.xz && \ cd Python-$PYTHON_VERSION && \ @@ -52,7 +52,7 @@ RUN cd /tmp/ && \ make -j install && \ cd .. && \ rm -r /tmp/Python-$PYTHON_VERSION.tar.xz /tmp/Python-$PYTHON_VERSION && \ - apt-get remove -y libbz2-dev # https://github.com/google/oss-fuzz/issues/3888 + apt-get remove -y $PYTHON_DEPS # https://github.com/google/oss-fuzz/issues/3888 # Download and install the latest stable Go. ADD https://storage.googleapis.com/golang/getgo/installer_linux $SRC/ |