Test deployment with app_port "3000:80"

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,45 @@
+#!/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 "$@"

Dockerfile

@@ -3,15 +3,20 @@ FROM ohif/app:v3.7.0-beta.74
 # first set user as root to add new user (then later change to user)
 USER root
 
-# Set up a new user named "user" with user ID 1000
-# RUN useradd -m -u 1000 user
-RUN adduser -D -u 1000 "user"
+# To install usermod in Alpine Linux
+#RUN echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories
+#RUN apk add -U shadow
 
-# Switch to the "user" user
-USER user
+# 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=8080
+# ENV PORT=80
+
+RUN ls
 
 # Set home to the user's home directory
 ENV HOME=/home/user \
@@ -21,19 +26,42 @@ ENV HOME=/home/user \
 WORKDIR $HOME/app
 
 # Copy the current directory contents into the container at $HOME/app setting the owner to the user
-COPY --chown=user . $HOME/app
-
-RUN ls
+#COPY --chown=nginx . $HOME/app
 
 # change to nginx user
-USER nginx
+#USER nginx
+
+#USER user
 
-#CMD ["docker-compose", "-f", "/code/dsa/docker-compose.yml", "up", "-d"]
+# 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
 
-# ENTRYPOINT ["sh", "/docker-entrypoint.sh"]
+#RUN chmod 777 /usr/src/entrypoint.sh
+
+#COPY --chown=nginx . .
+
+# RUN rm /etc/nginx/conf.d/default.conf
+
+#USER nginx
+#COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
+#RUN chmod 777 /usr/src/entrypoint.sh
+
+#RUN chmod +x /usr/src/entrypoint.sh
 
 # reverse proxy server
-EXPOSE 3000
-EXPOSE 8080
+#EXPOSE 80
+#EXPOSE 80/tcp
+#EXPOSE 3000
 
+# change back to nginx user 
+#USER nginx
+
+ENTRYPOINT ["/usr/src/entrypoint.sh"]
+
+# Launch nginx
 CMD ["nginx", "-g", "daemon off;"]
+
+#CMD ["bash", "run.sh"]

README.md

@@ -3,7 +3,7 @@ title: 'dsa4hf: Project to showcase AI solutions for medical applications in OHI
 colorFrom: indigo
 colorTo: indigo
 sdk: docker
-app_port: 3000
+app_port: "3000:80"
 emoji: 🔬
 pinned: false
 license: mit

nginx.conf

@@ -0,0 +1,24 @@
+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";
+    }
+}

nginx_old.conf

@@ -0,0 +1,24 @@
+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";
+    }
+}