Skip to content

Commit 50cdf10

Browse files
committed
move libsqlite-dev install back to dockerfile
1 parent 0be5993 commit 50cdf10

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

builds/cedar-14.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
77
DEBIAN_FRONTEND=noninteractive \
88
STACK="cedar-14"
99

10-
RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
10+
RUN apt-get update && apt-get install -y python-pip libsqlite3-dev realpath && rm -rf /var/lib/apt/lists/*
1111

1212
COPY requirements.txt /app/
1313
RUN pip install -r /app/requirements.txt

builds/heroku-16.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
77
DEBIAN_FRONTEND=noninteractive \
88
STACK="heroku-16"
99

10-
RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
10+
RUN apt-get update && apt-get install -y python-pip libsqlite3-dev && rm -rf /var/lib/apt/lists/*
1111

1212
COPY requirements.txt /app/
1313
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt

builds/heroku-18.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
77
DEBIAN_FRONTEND=noninteractive \
88
STACK="heroku-18"
99

10-
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/*
10+
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/*
1111

1212
COPY requirements.txt /app/
1313
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt

builds/runtimes/python3

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,6 @@ python_version=${BASE^} # this gives us only the filename with version number
1616
version_number=$(echo "$python_version" | cut -d- -f2) # this returns just X.X.X
1717
dep_url=https://python.org/ftp/python/${version_number}/${python_version}.tgz
1818

19-
# Install SQLITE, as headers are not available out of the box on the stack
20-
apt-get install libsqlite3-dev
21-
needed=( libsqlite3-dev )
22-
if [[ $STACK == "cedar-14" ]]; then
23-
needed+=( realpath )
24-
25-
# Check whether our packages are missing on the stack
26-
missing=$(comm -1 -3 <(dpkg-query -W -f '${package}\n' | sort) <(IFS=$'\n'; echo "${needed[*]}" | sort))
27-
if [[ "$missing" ]]; then
28-
# install missing and needed packages
29-
apt-get update -qq || { echo "Failed to 'apt-get update'. You must build this formula using Docker."; exit 1; }
30-
apt-get install -q -y $missing
31-
fi
32-
3319
curl -L "${dep_url}" | tar xz -C "${OUT_PREFIX}"
3420
mv "${OUT_PREFIX}/${python_version}" src
3521
cd src

0 commit comments

Comments
 (0)