From 06e431897dda276fb1105a670a1519ddf31a5fd0 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Mon, 3 Apr 2023 14:17:06 -0600 Subject: [PATCH] Remove build-essential again [skip ci] Since the psycopg2 fix went in, maybe we don't need it. https://github.com/psycopg/psycopg2/issues/1360#issuecomment-1494156272 --- cmd/ddev/cmd/ssh.go | 2 +- containers/ddev-webserver/Dockerfile | 1 - .../ddev-webserver/ddev-webserver-base-scripts/functions.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/ddev/cmd/ssh.go b/cmd/ddev/cmd/ssh.go index ec789a1bcf10..e1989bf2dd7e 100644 --- a/cmd/ddev/cmd/ssh.go +++ b/cmd/ddev/cmd/ssh.go @@ -30,7 +30,7 @@ ddev ssh -d /var/www/html`, } app := projects[0] instrumentationApp = app - + app.DockerEnv() // Use bash for our containers, sh for 3rd-party containers diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile index b12c358759f1..5e9cae6be78c 100644 --- a/containers/ddev-webserver/Dockerfile +++ b/containers/ddev-webserver/Dockerfile @@ -61,7 +61,6 @@ SHELL ["/bin/bash", "-c"] RUN DEBIAN_FRONTEND=noninteractive apt-get -qq install -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests -y \ blackfire \ blackfire-php \ - build-essential \ fontconfig \ gettext \ git \ diff --git a/containers/ddev-webserver/ddev-webserver-base-scripts/functions.sh b/containers/ddev-webserver/ddev-webserver-base-scripts/functions.sh index 41e5a95bd7d8..d68dee8a3be2 100644 --- a/containers/ddev-webserver/ddev-webserver-base-scripts/functions.sh +++ b/containers/ddev-webserver/ddev-webserver-base-scripts/functions.sh @@ -17,7 +17,7 @@ function ddev_python_setup { if [ "${DDEV_WEBSERVER_TYPE}" = "nginx-gunicorn" ]; then python -m venv /var/www/html/.ddev/.venv source /var/www/html/.ddev/.venv/bin/activate - pip install wheel gunicorn psycopg2 + pip install wheel django gunicorn psycopg2 if [ -f /var/www/html/requirements.txt ]; then pip install -r /var/www/html/requirements.txt fi