Fixed Docker image build

.github/workflows/docker_image_build.yml

@@ -9,10 +9,9 @@ on:
       - 'dev'
 
 jobs:
-  pytest:
-    uses: hotosm/gh-workflows/.github/workflows/test_pytest.yml@main
+  build:
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@main
     secrets: inherit
     with:
       image_name: ghcr.io/${{ github.repository }}
       build_target: prod
-      environment: dev

.gitignore

@@ -4,3 +4,5 @@
 **/__pycache__/
 **/.pytest_cache/
 **/.venv/
+node_modules
+**/dist/

Dockerfile

@@ -1,5 +1,11 @@
 ARG PYTHON_IMG_TAG=3.11
+ARG NODE_IMG_TAG=20.5.1
 
+FROM node:${NODE_IMG_TAG}-bookworm-slim as frontend-base
+WORKDIR /app
+COPY ./frontend ./frontend
+RUN cd frontend && npm install
+RUN cd frontend && npm run build
 
 # Define the base stage
 FROM docker.io/python:${PYTHON_IMG_TAG}-slim-bookworm as base
@@ -35,7 +41,7 @@ RUN pip install --no-cache-dir --upgrade pip \
     poetry==1.7.1 poetry-plugin-export==1.6.0 \
     && poetry config warnings.export false
 RUN poetry export --without dev --output requirements.txt
-RUN poetry export --only dev --output requirements-dev.txt
+RUN poetry export --with dev --output requirements-dev.txt
 
 
 # Define build stage (install deps)
@@ -51,13 +57,17 @@ RUN set -ex \
         "libjpeg62-turbo-dev" \
         "zlib1g-dev" \
         "libwebp-dev" \
+        "nodejs" \
+        "npm" \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=extract-deps \
     /opt/python/requirements.txt /opt/python/
+# Copy the built CSS from the Node.js stage
+# COPY --from=frontend-base /dist/ /dist/
+# Install dependencies
 RUN pip install --user --no-warn-script-location \
     --no-cache-dir -r /opt/python/requirements.txt
 
-
 # Define run stage
 FROM base as runtime
 ARG PYTHON_IMG_TAG
@@ -88,10 +98,15 @@ COPY --chown=wagtail:wagtail container-entrypoint.sh /
 COPY --from=build \
     /root/.local \
     /home/wagtail/.local
+# Copy compiled css from frontend stage
+COPY --from=frontend-base \
+    /app/frontend/dist \
+    /app/frontend/dist
 # Use /app folder as a directory where the source code is stored.
 WORKDIR /app
 # Copy project
 COPY . /app/
+
 # Add non-root user, permissions
 RUN useradd -u 1001 -m -c "hotosm account" -d /home/wagtail -s /bin/false wagtail \
     && chown -R wagtail:wagtail /app /home/wagtail \
@@ -102,28 +117,31 @@ USER wagtail
 ENTRYPOINT ["/container-entrypoint.sh"]
 
 
+# Define dev-deps stage (install requirements-dev)
+FROM runtime as dev-deps
+COPY --from=extract-deps --chown=wagtail \
+    /opt/python/requirements-dev.txt /home/wagtail/
+RUN pip install --user --no-warn-script-location \
+    --no-cache-dir -r /home/wagtail/requirements-dev.txt \
+    && rm -r /home/wagtail/requirements-dev.txt
+
+
 # Define test (ci) stage
-FROM runtime as test
+FROM dev-deps as test
 USER root
 ARG PYTHON_IMG_TAG
-COPY --from=extract-deps \
-    /opt/python/requirements-dev.txt /opt/python/
 # Copy packages from user to root dirs (run ci as root)
-# && install dev dependencies (pytest)
 RUN mv /home/wagtail/.local/bin/* /usr/local/bin/ \
-    && mv /home/wagtail/.local/lib/python${PYTHON_IMG_TAG}/site-packages/* \
+    && cp -R /home/wagtail/.local/lib/python${PYTHON_IMG_TAG}/site-packages/* \
     /usr/local/lib/python${PYTHON_IMG_TAG}/site-packages/ \
-    && pip install --upgrade --no-warn-script-location \
-    --no-cache-dir -r \
-    /opt/python/requirements-dev.txt \
-    && rm -r /opt/python \
+    && rm -rf /home/wagtail/.local/ \
     # Pre-compile packages to .pyc (init speed gains)
     && python -c "import compileall; compileall.compile_path(maxlevels=10, quiet=1)"
 CMD ["pytest"]
 
 
 # Define debug (development) stage
-FROM runtime as debug
+FROM dev-deps as debug
 # Add Healthcheck
 HEALTHCHECK --start-period=10s --interval=5s --retries=20 --timeout=5s \
     CMD curl --fail http://localhost:8000 || exit 1

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build-dev build-prod test up-dev up-prod down-dev down-prod
 
-build-dev:
+build:
 	@docker compose -f docker-compose.dev.yml build
 	@docker compose -f docker-compose.dev.yml up -d
 
@@ -9,17 +9,15 @@ build-prod:
 	@docker compose -f docker-compose.prod.yml up -d
 
 test:
-	@docker build --target test -t myproject:test -f Dockerfile .
-	@docker run --rm myproject:test
-	@docker rmi myproject:test
+	@docker compose -f docker-compose.dev.yml run --rm web pytest
 
-up-dev:
+up:
 	@docker compose -f docker-compose.dev.yml up -d
 
 up-prod:
 	@docker compose -f docker-compose.prod.yml up
 
-down-dev:
+down:
 	@docker compose -f docker-compose.dev.yml down
 
 down-prod:

README.md

@@ -18,18 +18,18 @@ Remember to keep your `.env` file secure and do not commit it to your version co
 
 ## Dependency Management
 
-This project uses Pipenv for dependency management. Pipenv is a Python tool that combines the best features of pip (Python's package installer), Pipfile (a manifest file format for Python package requirements), and virtualenv (a tool for creating isolated Python environments).
+This project uses Poetry for dependency management. Poetry is a Python tool that helps to handle dependency installation, building packages, and versioning. It simplifies package management and deployment by adding a layer of abstraction over the standard setup tools.
 
-Dependencies are specified in the `Pipfile`, and the exact versions of the dependencies are locked in the `Pipfile.lock`. To install the dependencies, run `pipenv install`. To add a new dependency, run `pipenv install {dependency}`.
+Dependencies are specified in the `pyproject.toml`, and the exact versions of the dependencies are locked in the `poetry.lock`. To install the dependencies, run `poetry install`. To add a new dependency, run `poetry add {dependency}`.
 
 ## Using the Makefile
 
 Ensure you have the superuser credentials you want in your .env.dev file prior to running `make build-dev`.
 The Makefile provides several commands for building and running the project:
 
-- `make build-dev`: Builds and starts the Docker images for the development environment.
-- `make up-dev`: Starts the Docker containers for the development environment.
-- `make down-dev`: Stops the Docker containers for the development environment.
+- `make build`: Builds and starts the Docker images for the development environment.
+- `make up`: Starts the Docker containers for the development environment.
+- `make down`: Stops the Docker containers for the development environment.
 - `make build-prod`: Builds the Docker images for the production environment.
 - `make up-prod`: Starts the Docker containers for the production environment.
 - `make down-prod`: Stops the Docker containers for the production environment.