mozmeao · pmac · Sep 27, 2024 · Sep 27, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,7 @@
 FROM mozmeao/bedrock:prod-latest
 USER root
-COPY requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
 COPY settings_local.py bedrock/settings/local.py
-COPY update_etags.py sitemap_utils.py bin/run-generator.sh ./
+COPY update_sitemap_json.py sitemap_utils.py bin/run-generator.sh ./
 ARG USER_ID=1000:1000
 ENV USER_ID=${USER_ID}
 RUN chown -R "${USER_ID}" /app

diff --git a/bin/run-generator.sh b/bin/run-generator.sh
@@ -3,12 +3,4 @@ set -ex
 bin/run-db-download.py
 python manage.py l10n_update
 python manage.py update_sitemaps
-sed -i -E -e 's|<html class="windows x86 no-js".+>|<html class="windows x86 no-js">|' bedrock/base/templates/base-protocol.html
-# needed for app to start
-touch data/last-run-update_locales data/last-run-download_database
-# turn off mutable static files storage
-cat bedrock/settings/local.py >> bedrock/settings/__init__.py
-bin/run-prod.sh > /dev/null &
-urlwait http://localhost:8000 60
-sleep 2
-python update_etags.py
+python update_sitemap_json.py
diff --git a/requirements.in b/requirements.in
diff --git a/requirements.txt b/requirements.txt
diff --git a/update_etags.py b/update_etags.py
diff --git a/update_sitemap_json.py b/update_sitemap_json.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+import json
+import sys
+
+from sitemap_utils import (
+    DATA_PATH,
+    load_current_sitemap,
+)
+
+
+SITEMAP_OUT_FILE = DATA_PATH.joinpath("sitemap.json")
+
+
+def write_sitemap_json(sitemap):
+    """Write the sorted sitemap.json file to the repo for use in bedrock"""
+    sorted_sitemap = {url: sorted(locales) for url, locales in sitemap.items()}
+    with SITEMAP_OUT_FILE.open("w") as fh:
+        json.dump(sorted_sitemap, fh, sort_keys=True, indent=2)
+
+
+def main():
+    sitemap = load_current_sitemap()
+    write_sitemap_json(sitemap)
+
+
+if __name__ == "__main__":
+    sys.exit(main())