Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DICOM files #647

Merged
merged 3 commits into from
Aug 2, 2023
Merged

DICOM files #647

merged 3 commits into from
Aug 2, 2023

Conversation

CGDogan
Copy link
Contributor

@CGDogan CGDogan commented Jul 28, 2023

Subpullrequests: camicroscope/SlideLoader#68 camicroscope/iipImage#17

  1. Allow .dcm extension
  2. Use caMicroscope/image-decoders, our new repo, as the base Dockerfile that builds OpenSlide. If needed, FROM camicroscope/image-decoders can replaced with apt-get install libopenslide0.

Before merging, Tony and Nan don't have access to caMicroscope Docker so @birm could you please publish an image of currnet https://github.com/camicroscope/image-decoders to Docker Hub so that we can change the images to be downloaded from camicroscope rather than currently my repo for easy testing.

caMicroscope.yml for testing my three pullrequests:

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/cgdogan/caracal.git#patch-2"
      args:
        viewer: "v3.10.2"
    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
      - ./jwt_keys/:/src/keys/
      - ./config/routes.json:/src/routes.json
      - ./config/contentSecurityPolicy.json:/src/contentSecurityPolicy.json
    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"
      GENERATE_KEY_IF_MISSING: "true"
  iip:
    build: "https://github.com/CGDogan/iipimage.git#earlydcm"
    container_name: ca-iip
    logging:
      options:
          max-file: "5"
          max-size: "10m"
    restart: always
    volumes:
      - ./images/:/images/
  loader:
    build: "https://github.com/CGDogan/SlideLoader.git#earlydcm"
    container_name: ca-load
    restart: always
    logging:
      options:
          max-file: "5"
          max-size: "10m"
    volumes:
      - ./images/:/images/

What do you think?

@CGDogan CGDogan changed the title DCM file extension DICOM files Jul 28, 2023
Copy link
Member

@birm birm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, I'll have to more carefully review/consider the corresponding PRs before merging though!

@birm
Copy link
Member

birm commented Jul 29, 2023

@CGDogan
Copy link
Contributor Author

CGDogan commented Jul 29, 2023

Yes, thanks, I have now updated the subpullrequests to use it

@birm
Copy link
Member

birm commented Aug 2, 2023

I think that we can merge all of these PRs now. @tcpan do you agree?

@birm birm merged commit afb7d87 into camicroscope:develop Aug 2, 2023
@birm birm mentioned this pull request Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants