Move assets stage to production only image

mozilla · Sep 27, 2024 · b196bbe · b196bbe
1 parent 1bc9398
commit b196bbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
@@ -49,7 +49,9 @@ jobs:
             name: Static Assets
             services: ''
             compose_file: docker-compose.yml
-            run: make test_static_assets
+            run: |
+              make compress_assets
+              make test_static_assets
           -
             name: Internal Routes
             services: ''

diff --git a/Dockerfile b/Dockerfile
@@ -174,9 +174,6 @@ COPY docker/etc/mime.types /etc/mime.types
 COPY --chown=olympia:olympia . ${HOME}
 # Copy compiled locales from builder
 COPY --from=locales --chown=olympia:olympia ${HOME}/locale ${HOME}/locale
-# Copy assets from assets
-COPY --from=assets --chown=olympia:olympia ${HOME}/site-static ${HOME}/site-static
-COPY --from=assets --chown=olympia:olympia ${HOME}/static-build ${HOME}/static-build
 
 # Set shell back to sh until we can prove we can use bash at runtime
 SHELL ["/bin/sh", "-c"]
@@ -190,5 +187,8 @@ FROM sources AS production
 
 # Copy dependencies from `pip_production`
 COPY --from=pip_production --chown=olympia:olympia /deps /deps
+# Copy assets from assets
+COPY --from=assets --chown=olympia:olympia ${HOME}/site-static ${HOME}/site-static
+COPY --from=assets --chown=olympia:olympia ${HOME}/static-build ${HOME}/static-build