From 5a1d31f876894676d62851545ebfab1ff88e3c45 Mon Sep 17 00:00:00 2001 From: Birm Date: Mon, 15 Jan 2024 20:39:32 -0500 Subject: [PATCH] precisionfda first new version --- .travis.yml | 15 - {posrgres_data => backups}/.gitignore | 1 + backups/README.md | 1 + caMicroscope-prebuild.yml | 75 - caMicroscope.yml | 65 - develop.yml => camic-precisionfda.yml | 8 +- .../credentials/google-drive.json | 2 - cloud-upload-apis/tokens/dummy.pickle | 2 - config/login.html | 153 +- config/routes.json | 1298 +++++++---------- dh_caMicroscope.yml | 48 - kc_caMicroscope.yml | 104 -- migrate/README.md | 23 - migrate/convert_heatmaps.js | 87 -- migrate/heatmap_prov_rename.js | 15 - migrate/migration.js | 34 - simpleTestData.js | 19 + 17 files changed, 602 insertions(+), 1348 deletions(-) delete mode 100644 .travis.yml rename {posrgres_data => backups}/.gitignore (58%) create mode 100644 backups/README.md delete mode 100644 caMicroscope-prebuild.yml delete mode 100644 caMicroscope.yml rename develop.yml => camic-precisionfda.yml (83%) delete mode 100644 cloud-upload-apis/credentials/google-drive.json delete mode 100644 cloud-upload-apis/tokens/dummy.pickle delete mode 100644 dh_caMicroscope.yml delete mode 100644 kc_caMicroscope.yml delete mode 100644 migrate/README.md delete mode 100644 migrate/convert_heatmaps.js delete mode 100644 migrate/heatmap_prov_rename.js delete mode 100644 migrate/migration.js create mode 100644 simpleTestData.js diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b9a7d7a3..00000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -sudo: required -language: node_js -node_js: - - "node" -before_script: - - cd test - - npm install - - npm install -g mocha -services: - - docker -script: - - docker-compose -f ../develop.yml build - - docker-compose -f ../develop.yml up -d - - sleep 120 - - mocha *.js --exit diff --git a/posrgres_data/.gitignore b/backups/.gitignore similarity index 58% rename from posrgres_data/.gitignore rename to backups/.gitignore index d6b7ef32..e5af87e9 100644 --- a/posrgres_data/.gitignore +++ b/backups/.gitignore @@ -1,2 +1,3 @@ * !.gitignore +!README.md \ No newline at end of file diff --git a/backups/README.md b/backups/README.md new file mode 100644 index 00000000..cfd9bafd --- /dev/null +++ b/backups/README.md @@ -0,0 +1 @@ +User file backup data goes here after mount from caracal's /src/backups. \ No newline at end of file diff --git a/caMicroscope-prebuild.yml b/caMicroscope-prebuild.yml deleted file mode 100644 index c90245c1..00000000 --- a/caMicroscope-prebuild.yml +++ /dev/null @@ -1,75 +0,0 @@ -version: '3' - -services: - mongo: - image: mongo:4.2-bionic - container_name: ca-mongo - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./db:/data/db - idxMongo: - image: mongo:4.2-bionic - container_name: ca-idx - links: - - mongo - volumes: - - ./config:/config - command: bash /config/run_idx.sh - logging: - options: - max-file: "5" - max-size: "10m" - depends_on: - - mongo - back: - image: ghcr.io/camicroscope/caracal:fda-htt - depends_on: - - "mongo" - ports: - - "4010:4010" - container_name: ca-back - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./images/:/images/ - - ./config/login.html:/src/static/login.html - - ./config/user.json:/src/static/user.json - - ./jwt_keys/:/src/keys/ - - ./bkps/:/src/bkps/ - - ./config/routes.json:/src/routes.json - - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json - environment: - CURRENT_USER_ID: ${userID} - JWK_URL: "https://www.googleapis.com/oauth2/v3/certs" - IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi" - MONGO_URI: "mongodb://ca-mongo" - DISABLE_TF: "true" - ALLOW_PUBLIC: "true" - DISABLE_SEC: "true" - iip: - image: camicroscope/iipimage:version-3.8.4 - container_name: ca-iip - logging: - options: - max-file: "5" - max-size: "10m" - restart: always - volumes: - - ./images/:/images/ - loader: - image: ghcr.io/camicroscope/slideloader:master - container_name: ca-load - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./images/:/images/ diff --git a/caMicroscope.yml b/caMicroscope.yml deleted file mode 100644 index d977ebac..00000000 --- a/caMicroscope.yml +++ /dev/null @@ -1,65 +0,0 @@ -version: '3' - -services: - mongo: - image: mongo:4.2-bionic - container_name: ca-mongo - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./db:/data/db - back: - build: - context: "https://github.com/camicroscope/caracal.git#v3.10.0" - args: - viewer: "v3.10.1" - depends_on: - - "mongo" - ports: - - "4010:4010" - - "8080:4010" - container_name: ca-back - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./images/:/images/ - - ./config/login.html:/src/static/login.html - - ./config/user.json:/src/static/user.json - - ./jwt_keys/:/src/keys/ - - ./bkps/:/src/bkps/ - - ./config/routes.json:/src/routes.json - - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json - environment: - CURRENT_USER_ID: ${userID} - JWK_URL: "https://www.googleapis.com/oauth2/v3/certs" - IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi" - MONGO_URI: "mongodb://ca-mongo" - DISABLE_TF: "true" - ALLOW_PUBLIC: "true" - DISABLE_SEC: "true" - iip: - image: camicroscope/iipimage:version-3.8.4 - container_name: ca-iip - logging: - options: - max-file: "5" - max-size: "10m" - restart: always - volumes: - - ./images/:/images/ - loader: - build: "https://github.com/camicroscope/SlideLoader.git#v3.10.0" - container_name: ca-load - restart: always - logging: - options: - max-file: "5" - max-size: "10m" - volumes: - - ./images/:/images/ diff --git a/develop.yml b/camic-precisionfda.yml similarity index 83% rename from develop.yml rename to camic-precisionfda.yml index 4e5fa63d..bcf11c60 100644 --- a/develop.yml +++ b/camic-precisionfda.yml @@ -8,9 +8,9 @@ services: - ./db:/data/db back: build: - context: "https://github.com/camicroscope/caracal.git#develop" + context: "https://github.com/camicroscope/caracal.git#fda/htt-precision" args: - viewer: "develop" + viewer: "fda/htt-precision" fork: "camicroscope" depends_on: - "mongo" @@ -22,12 +22,15 @@ services: - ./jwt_keys/:/src/keys/ - ./config/routes.json:/src/routes.json - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json + - ./backups/:/src/bkps environment: JWK_URL: "https://www.googleapis.com/oauth2/v3/certs" IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi" MONGO_URI: "mongodb://ca-mongo" DISABLE_SEC: "true" ALLOW_PUBLIC: "true" + userType: "Expert" + user: "Testing as Birm" iip: build: "https://github.com/camicroscope/iipimage.git#develop" container_name: ca-iip @@ -39,4 +42,3 @@ services: container_name: ca-load volumes: - ./images/:/images/ - - ./cloud-upload-apis/:/cloud-upload-apis/ diff --git a/cloud-upload-apis/credentials/google-drive.json b/cloud-upload-apis/credentials/google-drive.json deleted file mode 100644 index efd018a5..00000000 --- a/cloud-upload-apis/credentials/google-drive.json +++ /dev/null @@ -1,2 +0,0 @@ -This is a dummy file. -Replace this file with your own credentials file from [console.developers.google.com] for Google Drive API V3 \ No newline at end of file diff --git a/cloud-upload-apis/tokens/dummy.pickle b/cloud-upload-apis/tokens/dummy.pickle deleted file mode 100644 index 5c6f7f0a..00000000 --- a/cloud-upload-apis/tokens/dummy.pickle +++ /dev/null @@ -1,2 +0,0 @@ -This is a dummy token file. -All the token files for users will be stored in this directory in a pattern of "googleDrive.pickle" \ No newline at end of file diff --git a/config/login.html b/config/login.html index 26006d1d..babdc14e 100644 --- a/config/login.html +++ b/config/login.html @@ -3,14 +3,10 @@ FDA HTT - CaMicroscope -