fix: Docker build time was very slow on a tiny change

Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.7-labs
 # This dockerfile is used to publish the `ohif/app` image on dockerhub.
 #
 # It's a good example of how to build our static application and package it
@@ -19,45 +20,51 @@
 #
 
 
-# Stage 1: Build the application
-# docker build -t ohif/viewer:latest .
-FROM node:18.16.1-slim as json-copier
-
-RUN mkdir /usr/src/app
-WORKDIR /usr/src/app
-
-COPY ["package.json", "yarn.lock", "preinstall.js", "./"]
-COPY extensions /usr/src/app/extensions
-COPY modes /usr/src/app/modes
-COPY platform /usr/src/app/platform
+# syntax=docker/dockerfile:1.7-labs
+# This dockerfile is used to publish the `ohif/app` image on dockerhub.
+#
+# It's a good example of how to build our static application and package it
+# with a web server capable of hosting it as static content.
+#
+# docker build
+# --------------
+# If you would like to use this dockerfile to build and tag an image, make sure
+# you set the context to the project's root directory:
+# https://docs.docker.com/engine/reference/commandline/build/
+#
+#
+# SUMMARY
+# --------------
+# This dockerfile is used as an input for a second stage to make things run faster.
+#
 
-# Find and remove non-package.json files
-#RUN find extensions \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
-#RUN find modes \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
-#RUN find platform \! -name "package.json" -mindepth 2 -maxdepth 2 -print | xargs rm -rf
 
+# Stage 1: Build the application
+# docker build -t ohif/viewer:latest .
 # Copy Files
-FROM node:18.16.1-slim as builder
+FROM node:22 as builder
 RUN apt-get update && apt-get install -y build-essential python3
 RUN mkdir /usr/src/app
 WORKDIR /usr/src/app
-
-COPY --from=json-copier /usr/src/app .
-
-# Run the install before copying the rest of the files
 RUN yarn config set workspaces-experimental true
-RUN yarn install --frozen-lockfile --verbose
+# RUN npm install -g [email protected]
+ENV PATH=/usr/src/app/node_modules/.bin:$PATH
 
-COPY . .
-
-# To restore workspaces symlinks
-RUN yarn install --frozen-lockfile --verbose
+# Do an initial install and then a final install
+COPY package.json yarn.lock preinstall.js lerna.json ./
+COPY --parents ./addOns/package.json ./addOns/*/*/package.json ./extensions/*/package.json ./modes/*/package.json ./platform/*/package.json ./
+# Run the install before copying the rest of the files
+RUN yarn install
+# Copy the local directory
+COPY --link --exclude=node_modules --exclude=yarn.lock --exclude=package.json . .
+# Do a second install to finalize things after the copy
+RUN yarn install
 
-ENV PATH /usr/src/app/node_modules/.bin:$PATH
+# Build here
+# After install it should hopefully be stable until the local directory changes
 ENV QUICK_BUILD true
 # ENV GENERATE_SOURCEMAP=false
-# ENV REACT_APP_CONFIG=config/default.js
-
+ENV REACT_APP_CONFIG=config/default.js
 RUN yarn run build
 
 # Stage 3: Bundle the built application into a Docker container

platform/app/public/config/kheops.js

@@ -2,7 +2,6 @@
 
 window.config = {
   routerBasename: '/',
-  // whiteLabeling: {},
   extensions: [],
   modes: [],
   customizationService: {},
@@ -24,8 +23,9 @@ window.config = {
     prefetch: 25,
   },
   // filterQueryParam: false,
-  // Uses the dicomweb proxy as the default URL
-  defaultDataSourceName: 'dicomwebproxy',
+  // Uses the ohif datasource as the default - this requires that KHEOPS be
+  // configured with an OHIF path to .../viewer/dicomwebproxy
+  defaultDataSourceName: 'ohif2',
   /* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
   // dangerouslyUseDynamicConfig: {
   //   enabled: true,