diff --git a/builds/cedar-14.Dockerfile b/builds/cedar-14.Dockerfile index ea11542..5d1ae59 100644 --- a/builds/cedar-14.Dockerfile +++ b/builds/cedar-14.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="cedar-14" -RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y python-pip libsqlite3-dev realpath && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install -r /app/requirements.txt diff --git a/builds/heroku-16.Dockerfile b/builds/heroku-16.Dockerfile index 324042e..6b0728e 100644 --- a/builds/heroku-16.Dockerfile +++ b/builds/heroku-16.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-16" -RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y python-pip libsqlite3-dev && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt diff --git a/builds/heroku-18.Dockerfile b/builds/heroku-18.Dockerfile index 7f0f942..80ad34d 100644 --- a/builds/heroku-18.Dockerfile +++ b/builds/heroku-18.Dockerfile @@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ DEBIAN_FRONTEND=noninteractive \ STACK="heroku-18" -RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel libsqlite3-dev && rm -rf /var/lib/apt/lists/* COPY requirements.txt /app/ RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt diff --git a/builds/runtimes/python3 b/builds/runtimes/python3 index 5578cec..1b6d152 100755 --- a/builds/runtimes/python3 +++ b/builds/runtimes/python3 @@ -16,20 +16,6 @@ python_version=${BASE^} # this gives us only the filename with version number version_number=$(echo "$python_version" | cut -d- -f2) # this returns just X.X.X dep_url=https://python.org/ftp/python/${version_number}/${python_version}.tgz -# Install SQLITE, as headers are not available out of the box on the stack -apt-get install libsqlite3-dev -needed=( libsqlite3-dev ) -if [[ $STACK == "cedar-14" ]]; then - needed+=( realpath ) - -# Check whether our packages are missing on the stack -missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort)) -if [[ "$missing" ]]; then - # install missing and needed packages - apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; } - apt-get install -q -y $missing -fi - curl -L "${dep_url}" | tar xz -C "${OUT_PREFIX}" mv "${OUT_PREFIX}/${python_version}" src cd src