Merge pull request #4957 from freelawproject/fix-deployment-action

chore(Dockerfile): Include Tailwind asset compilation in Docker build
freelawproject · Jan 23, 2025 · 5a2c57a · 5a2c57a
2 parents 8133a33 + 7d8303a
commit 5a2c57a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -67,8 +67,6 @@ jobs:
           }'
       - name: Wait for Temporary Pod to Start
         run: kubectl wait pods -n ${{ env.EKS_NAMESPACE }} --for condition=Ready --timeout=90s temp-pod-${{ steps.vars.outputs.sha_short }}
-      - name: Build tailwind assets
-        run: kubectl exec -n ${{ env.EKS_NAMESPACE }} temp-pod-${{ steps.vars.outputs.sha_short }} -- bash -c "npm install --prefix ./cl --no-input && npm run build --prefix ./cl --no-input"
       - name: Collect Static Assets
         id: collectStatic
         run: |

diff --git a/docker/django/Dockerfile b/docker/django/Dockerfile
@@ -57,6 +57,7 @@ COPY . /opt/courtlistener
 WORKDIR /opt/courtlistener/cl
 RUN npm install
 RUN npx webpack --mode=production --no-devtool
+RUN npm run build --no-input
 
 WORKDIR /opt
 
@@ -81,4 +82,4 @@ RUN chmod +x /opt/courtlistener/docker/django/docker-entrypoint.sh
 RUN chown www-data:www-data /opt/courtlistener/docker/django/docker-entrypoint.sh
 
 USER www-data
-ENTRYPOINT ["/bin/sh", "/opt/courtlistener/docker/django/docker-entrypoint.sh"]
+ENTRYPOINT ["/bin/sh", "/opt/courtlistener/docker/django/docker-entrypoint.sh"]