Upgrade psycopg2-binary to a version with arm64 packages prebuilt. Re…

…vert a bunch of build hacks as a result

Pipfile

@@ -16,7 +16,6 @@ typed-ast = "*"
 
 [packages]
 sqlalchemy = "==1.3.13"
-psycopg2-binary = "==2.8.6"
 jmespath = "==0.9.4"
 jsonpatch = "==1.25"
 pyyaml = "==5.4"
@@ -30,6 +29,7 @@ colr = "*"
 python-dateutil = "*"
 boto3 = "==1.17.9"
 botocore = "==1.20.9"
+psycopg2-binary = "==2.9.1"
 
 [requires]
 python_version = "3.9"

docker/Dockerfile-arm

@@ -2,13 +2,10 @@ FROM python:3.9-slim
 
 ADD /~https://github.com/amacneil/dbmate/releases/download/v1.11.0/dbmate-linux-arm64 /app/dbmate
 RUN chmod a+x /app/dbmate
-RUN apt-get update && apt-get install -y libpq-dev
 COPY requirements.txt /app/
 COPY migrations /app/migrations
 WORKDIR /app/
 RUN pip install -r requirements.txt
-COPY psycopg2_binary-2.8.6-cp39-cp39-linux_aarch64.whl /app/
-RUN pip install /app/psycopg2_binary-2.8.6-cp39-cp39-linux_aarch64.whl
 EXPOSE 5000/tcp
 COPY introspector.py /app/
 COPY introspector /app/introspector

docker/build_arm.sh

@@ -5,23 +5,9 @@ set -e
 PACKAGE=$1
 VERSION=$2
 
-export DOCKER_BUILDKIT=1
-WHEEL_TAG=goldfig/tempbuildwheel:latest
-docker build --platform linux/arm64 -f docker/BuildWheelDockerFile -t $WHEEL_TAG .
-
-CONTAINER_ID=$(docker run -t -d --rm $WHEEL_TAG)
-echo "Container ID $CONTAINER_ID"
-WHEEL_FILE=$(docker exec $CONTAINER_ID /usr/local/bin/pip cache list --format abspath)
-echo "Wheel file $WHEEL_FILE"
-LOCAL_WHEEL=psycopg2_binary-2.8.6-cp39-cp39-linux_aarch64.whl
-docker cp $CONTAINER_ID:$WHEEL_FILE $LOCAL_WHEEL
-docker stop $CONTAINER_ID
-
 echo "Building package ${PACKAGE}"
 
-pipenv lock -r > requirements.tmp
-sed '/psycopg2-binary.*/d' requirements.tmp > requirements.txt
-rm requirements.tmp
+pipenv lock -r > requirements.txt
 
 INTROSPECTOR_DOCKER_REPO=${DOCKER_REPO:-goldfig}
 IMAGE="${INTROSPECTOR_DOCKER_REPO}/${PACKAGE}:arm64-${VERSION}"