From 9cd26567f43384d116f10d77639823852a7be419 Mon Sep 17 00:00:00 2001
From: Tim McCormack <tmccormack@edx.org>
Date: Thu, 30 Jan 2025 19:02:35 +0000
Subject: [PATCH] feat: Various codejail improvements for devstack usage

- Run as root in dev target, for convenience and matching other images
- Fail RUN commands if there's an error
- Use gunicorn for both targets, since in devstack we can specify the CMD
  in the docker-compose file anyhow.
- Install make, less, and some editors in the dev target
- Set up virtualenv for dev environment
---
 dockerfiles/codejail.Dockerfile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/dockerfiles/codejail.Dockerfile b/dockerfiles/codejail.Dockerfile
index 0bc970c..3b540d8 100644
--- a/dockerfiles/codejail.Dockerfile
+++ b/dockerfiles/codejail.Dockerfile
@@ -27,6 +27,7 @@ ARG PYVER=3.12
 # - python*-dev: Header files for python extensions, required by many source wheels
 # - python*-venv: Allow creation of virtualenvs
 RUN <<EOF
+set -eu
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install \
   --quiet --yes --no-install-recommends \
@@ -61,10 +62,23 @@ python${PYVER} -m venv /venv
 EOF
 
 EXPOSE 8080
+CMD /venv/bin/gunicorn -c /app/codejail_service/docker_gunicorn_configuration.py \
+    --bind '0.0.0.0:8080' --workers=10 --max-requests=1000 --name codejail \
+    codejail_service.wsgi:application
 
 
 FROM app AS dev
 
+# Developers will want some additional packages for interactive debugging.
+RUN <<EOF
+set -eu
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get install  \
+  --quiet --yes --no-install-recommends \
+  make less nano emacs-nox
+rm -rf /var/lib/apt/lists/*
+EOF
+
 RUN /venv/bin/pip-sync requirements/dev.txt
 RUN python${PYVER} -m compileall /venv
 
@@ -72,8 +86,8 @@ RUN python${PYVER} -m compileall /venv
 ADD https://github.com/${GITHUB_REPO}.git#${VERSION} .
 RUN python${PYVER} -m compileall /app
 
-USER app
-CMD echo $PATH; while true; do /venv/bin/python ./manage.py runserver 0.0.0.0:8080; sleep 2; done
+# Set up virtualenv for developer
+ENV PATH="/venv/bin:$PATH"
 
 
 FROM app AS prod
@@ -85,7 +99,5 @@ RUN python${PYVER} -m compileall /venv
 ADD https://github.com/${GITHUB_REPO}.git#${VERSION} .
 RUN python${PYVER} -m compileall /app
 
+# Drop to unprivileged user for running service
 USER app
-CMD /venv/bin/gunicorn -c /app/codejail_service/docker_gunicorn_configuration.py \
-    --bind '0.0.0.0:8080' --workers=2 --max-requests=1000 --name codejail \
-    codejail_service.wsgi:application