From c101d70caa547673d8bd91489f3c3ae852ade4ea Mon Sep 17 00:00:00 2001 From: Blaine Jester Date: Thu, 12 Mar 2026 10:56:02 -0700 Subject: [PATCH] Fix copy path needing one more /contentcuration --- docker-compose.prod.yml | 24 ++++++++++++++++++++++++ docker/Dockerfile.prod | 12 +++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000000..8ac4459c0d --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,24 @@ +services: + studio-app: + build: + context: . + dockerfile: docker/Dockerfile.prod + image: learningequality/studio-app-prod + ports: + - "8080:8081" + volumes: + - .:/src + environment: + MPLBACKEND: ps + SHELL: /bin/bash + AWS_S3_ENDPOINT_URL: http://minio:9000 + AWS_BUCKET_NAME: content + DATA_DB_HOST: postgres + DJANGO_SETTINGS_MODULE: contentcuration.settings + RUN_MODE: docker-compose + CELERY_TIMEZONE: America/Los_Angeles + CELERY_REDIS_DB: 0 + CELERY_BROKER_ENDPOINT: redis + CELERY_RESULT_BACKEND_ENDPOINT: redis + CELERY_REDIS_PASSWORD: "" + REMAP_SIGTERM: "SIGQUIT" diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 1934f10c63..878c20559e 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -7,10 +7,8 @@ RUN corepack enable pnpm && pnpm install --frozen-lockfile COPY . . -# Ensure expected bundles directory exists and run production frontend build -RUN mkdir -p contentcuration/static/js/bundles \ - && ln -s /contentcuration/node_modules /contentcuration/contentcuration/node_modules \ - && pnpm run build +# The webpack build, creating the frontend assets, later copied to the final image +RUN pnpm run build FROM ghcr.io/astral-sh/uv:python3.10-trixie-slim @@ -46,11 +44,11 @@ RUN uv pip sync --system /contentcuration/requirements.txt COPY . /contentcuration/ # Copy compiled frontend static output from node-builder -COPY --from=node-builder /contentcuration/contentcuration/static /contentcuration/contentcuration/static +COPY --from=node-builder /contentcuration/contentcuration/contentcuration/static /contentcuration/contentcuration/contentcuration/static ARG COMMIT_SHA ENV RELEASE_COMMIT_SHA=$COMMIT_SHA -EXPOSE 8000 +EXPOSE 8081 -ENTRYPOINT ["make", "altprodserver"] +CMD ["make", "altprodserver"]