From 9d6d79ddacf70a9b2bd28c614ab08be86c6f3904 Mon Sep 17 00:00:00 2001 From: Amri Toufali Date: Fri, 14 Feb 2025 15:13:30 -0800 Subject: [PATCH 1/5] OBS-504: reorder docker commands to improve FE build speed --- docker/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d288eeb563..b2e8f6f126 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,10 +26,6 @@ COPY docker/set_up_stackwalker.sh /tmp/set_up_stackwalker.sh RUN /tmp/set_up_stackwalker.sh && \ rm /tmp/set_up_stackwalker.sh -# Install frontend JS deps -COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ -RUN cd /webapp-frontend-deps/ && npm install - COPY --chown=app:app requirements.txt /app/ RUN pip install --no-cache-dir --no-deps -r requirements.txt && \ pip check --disable-pip-version-check @@ -42,6 +38,10 @@ ENV PYTHONUNBUFFERED=1 \ NPM_ROOT_PATH=/webapp-frontend-deps/ \ NODE_PATH=/webapp-frontend-deps/node_modules/ +# Install frontend JS deps +COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ +RUN cd /webapp-frontend-deps/ && npm install + # app should own everything under /app in the container USER app From 18710da441ad9714003744ce4c1a5688a0448698 Mon Sep 17 00:00:00 2001 From: Amri Toufali Date: Fri, 14 Feb 2025 15:14:15 -0800 Subject: [PATCH 2/5] OBS-504: exclude devcontainer from default build target --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index ed5f478b74..f755f53b5e 100644 --- a/justfile +++ b/justfile @@ -12,8 +12,8 @@ _env: cp docker/config/.env.dist .env fi -# Build docker images -build *args: _env +# Build docker images (excludes devcontainer – unneeded for prod) +build *args='app test processor crontabber webapp stage_submitter fakesentry oidcprovider collector fakecollector symbolsserver statsd elasticsearch postgresql pubsub memcached gcs-emulator': _env docker compose build --progress plain {{args}} # Set up Postgres, Elasticsearch, local Pub/Sub, and local GCS services. From 2134275459588ca41468c40686030abb4c6d54e6 Mon Sep 17 00:00:00 2001 From: Amri Toufali Date: Fri, 14 Feb 2025 15:20:33 -0800 Subject: [PATCH 3/5] OBS-504: reorder devcontainer docker commands --- .devcontainer/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index fd8680202f..8b980e1cae 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -27,10 +27,6 @@ COPY docker/set_up_stackwalker.sh /tmp/set_up_stackwalker.sh RUN /tmp/set_up_stackwalker.sh && \ rm /tmp/set_up_stackwalker.sh -# Install frontend JS deps -COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ -RUN cd /webapp-frontend-deps/ && npm install - # Install Python dependencies COPY requirements.txt /app/ RUN pip install --no-cache-dir --no-deps -r requirements.txt && \ @@ -44,3 +40,7 @@ ENV PYTHONUNBUFFERED=1 \ CSSMIN_BINARY=/webapp-frontend-deps/node_modules/.bin/cssmin \ NPM_ROOT_PATH=/webapp-frontend-deps/ \ NODE_PATH=/webapp-frontend-deps/node_modules/ + +# Install frontend JS deps +COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ +RUN cd /webapp-frontend-deps/ && npm install \ No newline at end of file From cb5d6651879b2d6b1e7a459c7e099f3faa443280 Mon Sep 17 00:00:00 2001 From: Amri Toufali Date: Tue, 18 Feb 2025 08:59:41 -0800 Subject: [PATCH 4/5] Update justfile Co-authored-by: Sven Marnach --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index f755f53b5e..1aebbc7bb4 100644 --- a/justfile +++ b/justfile @@ -13,7 +13,7 @@ _env: fi # Build docker images (excludes devcontainer – unneeded for prod) -build *args='app test processor crontabber webapp stage_submitter fakesentry oidcprovider collector fakecollector symbolsserver statsd elasticsearch postgresql pubsub memcached gcs-emulator': _env +build *args='app fakesentry oidcprovider elasticsearch postgresql pubsub memcached gcs-emulator': _env docker compose build --progress plain {{args}} # Set up Postgres, Elasticsearch, local Pub/Sub, and local GCS services. From 99d659ccce03c83ed57a1fdb0e327d8e78d99ad9 Mon Sep 17 00:00:00 2001 From: Amri Toufali Date: Tue, 18 Feb 2025 12:23:49 -0800 Subject: [PATCH 5/5] Update justfile Co-authored-by: Will Kahn-Greene --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 1aebbc7bb4..49d31ee2fe 100644 --- a/justfile +++ b/justfile @@ -12,7 +12,7 @@ _env: cp docker/config/.env.dist .env fi -# Build docker images (excludes devcontainer – unneeded for prod) +# Build docker images build *args='app fakesentry oidcprovider elasticsearch postgresql pubsub memcached gcs-emulator': _env docker compose build --progress plain {{args}}