Problem
alyx/deploy/docker/ (in the alyx repo) duplicates iblsre/alyx/containers/docker/ — Dockerfile, Dockerfile_base, apache-conf, and settings files independently maintained in both places, building/pushing the same Docker Hub tags (internationalbrainlab/alyx_apache[_base]:latest).
iblsre is the pipeline actually used in production (confirmed against openalyx's live container). But alyx/docs/03_deployment.md ("Building the docker containers") still documents building from the alyx repo's own copy, to the same tags — a footgun: following that doc silently overwrites the production image with a possibly out-of-sync build. This is how our WSGI daemon config drifted between the two copies (see #151).
One exception: alyx/deploy/docker/settings-deploy.py is genuinely used by .github/workflows/main.yml to run CI under production-like settings, so it must stay.
Proposed fix
- Delete the redundant build machinery from
alyx/deploy/docker/: Dockerfile, Dockerfile_base, apache-conf-alyx, 000-default-conf-alyx (keep settings-deploy.py / settings_lab-deploy.py for CI).
- Update
docs/03_deployment.md's "Building the docker containers" section to point at iblsre instead of documenting a second build path.
Related: #151
Problem
alyx/deploy/docker/(in thealyxrepo) duplicatesiblsre/alyx/containers/docker/— Dockerfile, Dockerfile_base, apache-conf, and settings files independently maintained in both places, building/pushing the same Docker Hub tags (internationalbrainlab/alyx_apache[_base]:latest).iblsreis the pipeline actually used in production (confirmed against openalyx's live container). Butalyx/docs/03_deployment.md("Building the docker containers") still documents building from thealyxrepo's own copy, to the same tags — a footgun: following that doc silently overwrites the production image with a possibly out-of-sync build. This is how our WSGI daemon config drifted between the two copies (see #151).One exception:
alyx/deploy/docker/settings-deploy.pyis genuinely used by.github/workflows/main.ymlto run CI under production-like settings, so it must stay.Proposed fix
alyx/deploy/docker/:Dockerfile,Dockerfile_base,apache-conf-alyx,000-default-conf-alyx(keepsettings-deploy.py/settings_lab-deploy.pyfor CI).docs/03_deployment.md's "Building the docker containers" section to point atiblsreinstead of documenting a second build path.Related: #151