Remove manual build step

.dockerignore

@@ -1,2 +1,3 @@
 Dockerfile
-docker-compose.yml
+docker-compose.yml
+node_modules

.gitignore

@@ -20,3 +20,4 @@ terraform.tfstate*
 .terraform*
 tofu/kube.config
 ansible/collections/*
+quarry/web/static/templates/compiled.js

Dockerfile

@@ -17,9 +17,22 @@ RUN pip install --break-system-packages --upgrade pip==24.0 wheel && \
     pip install --break-system-packages -r requirements.txt
 
 # Copy app code
-USER quarry
 COPY . /app
 
+# Build JS assets
+RUN apt-get update &&  \
+    apt-get install -y nodejs npm && \
+    NODE_ENV=production npm ci && \
+    npm run build && \
+    # Once the build is run, dependencies are no longer needed, delete them
+    # to keep image small
+    rm -rf node_modules &&  \
+    apt-get remove -y nodejs npm && \
+    apt-get autoremove -y && \
+    rm -rf /var/lib/apt/lists/*
+
+USER quarry
+
 # Expose port for web server
 EXPOSE 5000
 

helm-quarry/values.yaml

@@ -1,6 +1,6 @@
 web:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-94 # web tag managed by github actions
+  tag: pr-91 # web tag managed by github actions
   resources:
     requests:
       memory: "300Mi"
@@ -11,7 +11,7 @@ web:
 
 worker:
   repository: 'quay.io/wikimedia-quarry/quarry'
-  tag: pr-94 # worker tag managed by github actions
+  tag: pr-91 # worker tag managed by github actions
   resources:
     requests:
       memory: "400Mi"