Reworked OHIF docker build setup

.docker/Viewer-v3.x/default.conf.template

@@ -1,16 +0,0 @@
-server {
-  listen ${PORT} default_server;
-  listen [::]:${PORT} default_server;
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-    add_header Cross-Origin-Opener-Policy same-origin;
-    add_header Cross-Origin-Embedder-Policy require-corp;
-    add_header Cross-Origin-Resource-Policy same-origin;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-  }
-}

.docker/Viewer-v3.x/default.conf_old.template

@@ -1,21 +0,0 @@
-server {
-  listen ${PORT} default_server;
-  listen [::]:${PORT} default_server;
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-    try_files $uri $uri/ /index.html;
-    add_header Cross-Origin-Opener-Policy same-origin;
-    add_header Cross-Origin-Embedder-Policy require-corp;
-    add_header Cross-Origin-Resource-Policy same-origin;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-  }
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
-}

.docker/Viewer-v3.x/entrypoint.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-
-if [ -n "$SSL_PORT" ]
-  then
-    envsubst '${SSL_PORT}:${PORT}' < /usr/src/default.ssl.conf.template > /etc/nginx/conf.d/default.conf
-  else
-    envsubst '${PORT}' < /usr/src/default.conf.template > /etc/nginx/conf.d/default.conf
-fi
-
-if [ -n "$APP_CONFIG" ]
-  then
-    echo "$APP_CONFIG" > /usr/share/nginx/html/app-config.js
-fi
-
-if [ -n "$CLIENT_ID" ] || [ -n "$HEALTHCARE_API_ENDPOINT" ]
-  then
-    # If CLIENT_ID is specified, use the google.js configuration with the modified ID
-    if [ -n "$CLIENT_ID" ]
-      then
-  	    echo "Google Cloud Healthcare \$CLIENT_ID has been provided: "
-  	    echo "$CLIENT_ID"
-  	    echo "Updating config..."
-
-  	    # - Use SED to replace the CLIENT_ID that is currently in google.js
-	      sed -i -e "s/YOURCLIENTID.apps.googleusercontent.com/$CLIENT_ID/g" /usr/share/nginx/html/google.js
-	  fi
-
-    # If HEALTHCARE_API_ENDPOINT is specified, use the google.js configuration with the modified endpoint
-    if [ -n "$HEALTHCARE_API_ENDPOINT" ]
-      then
-        echo "Google Cloud Healthcare \$HEALTHCARE_API_ENDPOINT has been provided: "
-        echo "$HEALTHCARE_API_ENDPOINT"
-        echo "Updating config..."
-
-        # - Use SED to replace the HEALTHCARE_API_ENDPOINT that is currently in google.js
-        sed -i -e "s+https://healthcare.googleapis.com/v1+$HEALTHCARE_API_ENDPOINT+g" /usr/share/nginx/html/google.js
-    fi
-
-	  # - Copy google.js to overwrite app-config.js
-	  cp /usr/share/nginx/html/google.js /usr/share/nginx/html/app-config.js
-fi
-
-echo "Starting Nginx to serve the OHIF Viewer..."
-
-exec "$@"

.gitattributes

@@ -0,0 +1,35 @@
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text

Dockerfile

@@ -1,67 +1,56 @@
-FROM ohif/app:v3.7.0-beta.74
+FROM node:16.15.0-slim as json-copier
 
-# first set user as root to add new user (then later change to user)
-USER root
-
-# To install usermod in Alpine Linux
-#RUN echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories
-#RUN apk add -U shadow
-
-# change user ID of "nginx" to 1000 to work with HF spaces
-# RUN find / -uid 1000 -exec chown -h 1000 {} +
-#RUN usermod -u 1000 nginx
-
-USER nginx
-
-# Set port as environmental variable for reverse proxy
-# ENV PORT=80
-
-RUN ls
-
-# Set home to the user's home directory
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
+RUN mkdir /usr/src/app
+WORKDIR /usr/src/app
+# Clone the application
+RUN apt-get update && apt-get install -y git
 
-# Set the working directory to the user's home directory
-WORKDIR $HOME/app
+RUN git clone --recursive https://github.com/OHIF/Viewers.git .
 
-# Copy the current directory contents into the container at $HOME/app setting the owner to the user
-#COPY --chown=nginx . $HOME/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
 
-# change to nginx user
-#USER nginx
+# 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
 
-#USER user
+# Copy Files
+FROM node:16.15.0-slim as builder
+RUN apt-get update && apt-get install -y build-essential python3
+RUN mkdir /usr/src/app
+WORKDIR /usr/src/app
 
-# Copy nginx configuration
-#COPY --chown=nginx nginx.conf /etc/nginx/sites-available/default
-#COPY --chown=nginx .docker/Viewer-v3.x/default.conf.template /usr/src/default.conf.template
-COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
-RUN chmod 777 /usr/src/entrypoint.sh
+COPY --from=json-copier /usr/src/app .
 
-#RUN chmod 777 /usr/src/entrypoint.sh
+# Run the install before copying the rest of the files
+RUN yarn config set workspaces-experimental true
+RUN yarn install --frozen-lockfile --verbose
 
-#COPY --chown=nginx . .
+COPY . .
 
-# RUN rm /etc/nginx/conf.d/default.conf
+# To restore workspaces symlinks
+RUN yarn install --frozen-lockfile --verbose
 
-#USER nginx
-#COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
-#RUN chmod 777 /usr/src/entrypoint.sh
+ENV PATH /usr/src/app/node_modules/.bin:$PATH
+ENV QUICK_BUILD true
+# ENV GENERATE_SOURCEMAP=false
+# ENV REACT_APP_CONFIG=config/default.js
 
-#RUN chmod +x /usr/src/entrypoint.sh
-
-# reverse proxy server
-#EXPOSE 80
-#EXPOSE 80/tcp
-#EXPOSE 3000
-
-# change back to nginx user 
-#USER nginx
-
-ENTRYPOINT ["/usr/src/entrypoint.sh"]
-
-# Launch nginx
+RUN yarn run build
+# Stage 3: Bundle the built application into a Docker container
+# which runs Nginx using Alpine Linux
+FROM nginxinc/nginx-unprivileged:1.25-alpine as final
+#RUN apk add --no-cache bash
+USER nginx
+COPY --chown=nginx:nginx nginx.conf /etc/nginx/conf.d/default.conf
+COPY --chown=nginx:nginx app-config.js /usr/share/nginx/html/app-config.js
+COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html
+# In entrypoint.sh, app-config.js might be overwritten, so chmod it to be writeable.
+# The nginx user cannot chmod it, so change to root.
+USER root
+RUN chmod 666 /usr/share/nginx/html/app-config.js
+USER nginx
 CMD ["nginx", "-g", "daemon off;"]
-
-#CMD ["bash", "run.sh"]

README.md

@@ -3,10 +3,13 @@ title: 'dsa4hf: Project to showcase AI solutions for medical applications in OHI
 colorFrom: indigo
 colorTo: indigo
 sdk: docker
-app_port: 3000
 emoji: 🔬
 pinned: false
 license: mit
+custom_headers:
+  cross-origin-embedder-policy: require-corp
+  cross-origin-opener-policy: same-origin
+  cross-origin-resource-policy: cross-origin
 ---
 
 # ohif4hf
@@ -26,7 +29,7 @@ When the solution is ready, the website should be accessible on [Hugging Face](h
 ```
 git clone https://github.com/andreped/ohif4hf.git
 docker build --no-cache -t ohif4hf .
-docker run -p 3000:80 ohif4hf
+docker run -p 4444:7860 ohif4hf
 ```
 
 To go inside docker image and debug, at the bottom of the Dockerfile, add `ENTRYPOINT [ "/bin/sh" ]` before running.

app-config.js

@@ -0,0 +1,28 @@
+window.config = {
+    routerBasename: "/",
+    extensions: [],
+    modes: [],
+    showStudyList: true,
+    dataSources: [
+      {
+        namespace: "@ohif/extension-default.dataSourcesModule.dicomweb",
+        sourceName: "dicomweb",
+        configuration: {
+          friendlyName: "dcmjs DICOMWeb Server",
+          name: "DCM4CHEE",
+          wadoUriRoot: "https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado",
+          qidoRoot: "https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs",
+          wadoRoot: "https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs",
+          qidoSupportsIncludeField: true,
+          supportsReject: true,
+          imageRendering: "wadors",
+          thumbnailRendering: "wadors",
+          enableStudyLazyLoad: true,
+          supportsFuzzyMatching: true,
+          supportsWildcard: true,
+          omitQuotationForMultipartRequest: true,
+        },
+      },
+    ],
+    defaultDataSourceName: "dicomweb",
+  };

nginx.conf

@@ -1,24 +1,20 @@
 server {
-    listen 3000 default_server;
-    listen [::]:3000 default_server;
-    
-    root /usr/share/nginx/html;
-    index index.html index.htm;
-
-    server_name _;
-    location / {
-        # serve OHIF 3000
-        proxy_pass http://localhost:80;
-        proxy_set_header    Host    $host;
-        proxy_set_header    X-Real-IP   $remote_addr;
-        proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-        #proxy_set_header   X-Forwarded-Proto   $scheme;
-        proxy_set_header    X-Forwarded-Proto   http;
-        proxy_set_header    X-Forwarded-Ssl     off;
-        proxy_set_header    X-Url-Scheme        http;
-        proxy_buffering     off;
-        proxy_http_version  1.1;
-        proxy_set_header    Upgrade $http_upgrade;
-        proxy_set_header    Connection  "upgrade";
-    }
-}
+  listen 7860 default_server;
+  listen [::]:7860 default_server;
+  location / {
+    root   /usr/share/nginx/html;
+    index  index.html index.htm;
+    try_files $uri $uri/ /index.html;
+    add_header Cross-Origin-Opener-Policy same-origin;
+    add_header Cross-Origin-Embedder-Policy require-corp;
+    add_header Cross-Origin-Resource-Policy cross-origin;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+  }
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   /usr/share/nginx/html;
+  }
+}

nginx_old.conf

@@ -1,24 +0,0 @@
-server {
-    listen 3000 default_server;
-    listen [::]:3000 default_server;
-    
-    root /usr/share/nginx/html;
-    index index.html index.htm;
-
-    server_name _;
-    location / {
-        # serve OHIF 3000
-        proxy_pass http://localhost:80;
-        proxy_set_header    Host    $host;
-        proxy_set_header    X-Real-IP   $remote_addr;
-        proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-        #proxy_set_header   X-Forwarded-Proto   $scheme;
-        proxy_set_header    X-Forwarded-Proto   http;
-        proxy_set_header    X-Forwarded-Ssl     off;
-        proxy_set_header    X-Url-Scheme        http;
-        proxy_buffering     off;
-        proxy_http_version  1.1;
-        proxy_set_header    Upgrade $http_upgrade;
-        proxy_set_header    Connection  "upgrade";
-    }
-}