Making manual changes to correct the missing steps from

uc-cdis · Jan 13, 2025 · cdd1ca5 · cdd1ca5
1 parent 2732708
commit cdd1ca5
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 2,736 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -288,6 +288,7 @@ jobs:
             else
               echo "Building and pushing Docker image from the master branch (beta releases)"
               rm -f ./.npmrc
+
               # Set our version number using vars
               export IMAGE_VERSION=$(cat version.txt)
               export IMAGE_VERSION_FULL=v$IMAGE_VERSION

diff --git a/extensions/tmtv/.webpack/webpack.prod.js b/extensions/tmtv/.webpack/webpack.prod.js
@@ -15,11 +15,6 @@ const ENTRY = {
 
 const outputName = `ohif-${pkg.name.split('/').pop()}`;
 
-const ENTRY = {
-  app: `${SRC_DIR}/index.tsx`,
-};
-
-
 module.exports = (env, argv) => {
   const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 

diff --git a/increaseEventEmitterLimit.mjs b/increaseEventEmitterLimit.mjs
diff --git a/platform/app/.recipes/Nginx-Dcm4che/docker-compose-dcm4che.env b/platform/app/.recipes/Nginx-Dcm4che/docker-compose-dcm4che.env
diff --git a/platform/app/.recipes/Nginx-Dcm4che/etc/localtime b/platform/app/.recipes/Nginx-Dcm4che/etc/localtime
diff --git a/platform/app/.recipes/Nginx-Dcm4che/etc/timezone b/platform/app/.recipes/Nginx-Dcm4che/etc/timezone
diff --git a/platform/app/.recipes/Nginx-Orthanc/docker-compose.yml b/platform/app/.recipes/Nginx-Orthanc/docker-compose.yml
@@ -9,11 +9,7 @@ services:
       # Project root
       context: ./../../../../
       # Relative to context
-<<<<<<<< HEAD:platform/app/.recipes/Nginx-Orthanc/docker-compose.yml
       dockerfile: ./platform/app/.recipes/Nginx-Orthanc/dockerfile
-========
-      dockerfile: ./platform/app/.recipes/OpenResty-Orthanc/dockerfile
->>>>>>>> 16afa740b6 (feat(app): change ohif viewer to ohif app (#3451)):platform/app/.recipes/OpenResty-Orthanc/docker-compose.yml
     image: webapp:latest
     container_name: ohif_orthanc
     volumes: