From b55c88a3555ce443729a32b5fe2665caeb4868f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A6var=20=C3=96fj=C3=B6r=C3=B0=20Magn=C3=BAsson?=
 <saevar@saevar.is>
Date: Mon, 16 Oct 2023 20:47:08 +0000
Subject: [PATCH 1/3] Single container test

---
 Dockerfile          |  8 ++++++--
 Dockerfile.frontend |  7 -------
 docker-compose.yml  | 16 ++--------------
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 Dockerfile.frontend

diff --git a/Dockerfile b/Dockerfile
index ff8202d..e82aba2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Use an official Python runtime as a parent image
-FROM python:3.8-bullseye
+FROM nikolaik/python-nodejs:python3.11-nodejs20-slim
 LABEL maintainer="hello@wagtail.org"
 
 # Set environment varibles
@@ -7,7 +7,7 @@ ENV PYTHONUNBUFFERED 1
 
 # Install libenchant and create the requirements folder.
 RUN apt-get update -y \
-    && apt-get install -y libenchant-2-dev postgresql-client \
+    && apt-get install -y libenchant-2-dev postgresql-client libpq-dev gcc \
     && mkdir -p /code/requirements
 
 # Install the bakerydemo project's dependencies into the image.
@@ -26,3 +26,7 @@ RUN cd /code/wagtail/ \
 COPY ./libs/Willow /code/willow/
 RUN cd /code/willow/ \
     && pip install -e .[testing]
+
+# Copy the npm dependencies and install them.
+COPY ./wagtail/package.json ./wagtail/package-lock.json ./
+RUN npm --prefix / install --loglevel info
diff --git a/Dockerfile.frontend b/Dockerfile.frontend
deleted file mode 100644
index 305c174..0000000
--- a/Dockerfile.frontend
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM node:18-slim
-LABEL maintainer="hello@wagtail.org"
-
-RUN apt-get update && apt-get install rsync make -y
-COPY ./wagtail/package.json ./wagtail/package-lock.json ./
-
-RUN npm --prefix / install --loglevel info
diff --git a/docker-compose.yml b/docker-compose.yml
index 449ec40..3f8bce4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     container_name: "web"
     build: ./
     working_dir: /code/bakerydemo
-    command: python manage.py runserver 0.0.0.0:8000
+    command: bash -c "cd /code/wagtail && npm run start & python manage.py runserver 0.0.0.0:8000"
     restart: "no"
     volumes:
       - ./wagtail:/code/wagtail:delegated,rw
@@ -22,7 +22,7 @@ services:
       PYTHONPATH: "/code/wagtail:/code/bakerydemo:$PYTHONPATH"
     depends_on:
       - db
-      - frontend
+      # - frontend
   db:
     container_name: "db"
     image: postgres:12.3-alpine
@@ -35,15 +35,3 @@ services:
     restart: "no"
     expose:
       - "5432"
-  frontend:
-    container_name: "frontend"
-    build:
-      context: .
-      dockerfile: Dockerfile.frontend
-    working_dir: /code/wagtail
-    volumes:
-      - ./wagtail:/code/wagtail:delegated,rw
-      - node_modules:/code/wagtail/node_modules/
-    command: bash -c "echo 'Copying node_modules, this may take a few minutes...' && rsync -rah --info=progress2 /node_modules /code/wagtail/ && npm run start"
-    restart: "no"
-    tty: true

From c833f7c87dc2dca71076e6d548b3e7d4e2a40643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A6var=20=C3=96fj=C3=B6r=C3=B0=20Magn=C3=BAsson?=
 <saevar@saevar.is>
Date: Mon, 16 Oct 2023 20:49:33 +0000
Subject: [PATCH 2/3] Remove reference to frontend

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3f8bce4..18dffc6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,6 @@ services:
       PYTHONPATH: "/code/wagtail:/code/bakerydemo:$PYTHONPATH"
     depends_on:
       - db
-      # - frontend
   db:
     container_name: "db"
     image: postgres:12.3-alpine

From 03f3d2e58fe4c7f636f21e82e956db1163f3ec84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A6var=20=C3=96fj=C3=B6r=C3=B0=20Magn=C3=BAsson?=
 <saevar@saevar.is>
Date: Wed, 18 Oct 2023 20:46:14 +0000
Subject: [PATCH 3/3] Add missing packages

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e82aba2..a717265 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV PYTHONUNBUFFERED 1
 
 # Install libenchant and create the requirements folder.
 RUN apt-get update -y \
-    && apt-get install -y libenchant-2-dev postgresql-client libpq-dev gcc \
+    && apt-get install -y libenchant-2-dev postgresql-client libpq-dev gcc make git \
     && mkdir -p /code/requirements
 
 # Install the bakerydemo project's dependencies into the image.