Skip to content

Commit 25d377a

Browse files
authored
Update Dockerfile Entrypoint in all models (#97)
- update our compliance rule to only allow `ENTRYPOINT ["mhub.run"]` - replace `ENTRYPOINT ["python3", "-m", "mhubio.run"]` in all models using the old, legacy entrypoint. By standardizing the entry point into our mhub.run script, we have a central control point for how the run script is started. This will make it easier to migrate to an updated Python version and use a venv in the future.
1 parent 9a3cf94 commit 25d377a

File tree

18 files changed

+19
-19
lines changed

18 files changed

+19
-19
lines changed

.github/scripts/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ def validateDockerfile(base: str, model_name: str):
214214
raise MHubComplianceError(f"Collection '{collection['name']}' is not imported by its name.", DocuRef.DOCKERFILE)
215215

216216
# check that the entrypoint of the dockerfile matches
217-
# ENTRYPOINT ["mhub.run"] | ENTRYPOINT ["python", "-m", "mhubio.run"]
218-
if not lines[-2].strip() in ['ENTRYPOINT ["mhub.run"]', 'ENTRYPOINT ["python3", "-m", "mhubio.run"]']:
217+
# ENTRYPOINT ["mhub.run"] | ENTRYPOINT ["python", "-m", "mhubio.run"] (deprecated, no longer allowed)
218+
if not lines[-2].strip() == 'ENTRYPOINT ["mhub.run"]':
219219
raise MHubComplianceError(f"Dockerfile does not contain the correct entrypoint: {lines[-2]}", DocuRef.DOCKERFILE)
220220

221221
# CMD ["--workflow", "default"] | CMD ["--config", "/app/models/$model_name/config/default.yml"]

models/casust/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ ARG MHUB_MODELS_REPO
4343
RUN buildutils/import_mhub_model.sh casust ${MHUB_MODELS_REPO}
4444

4545
# Default run script
46-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
46+
ENTRYPOINT ["mhub.run"]
4747
CMD ["--config", "/app/models/casust/config/default.yml"]

models/gc_autopet_fpr/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ RUN buildutils/import_mhub_model.sh gc_autopet_fpr ${MHUB_MODELS_REPO}
4242
ENV PYTHONPATH "/app:/opt/algorithm"
4343

4444
# Configure main entrypoint
45-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
45+
ENTRYPOINT ["mhub.run"]
4646
CMD ["--config", "/app/models/gc_autopet_fpr/config/default.yml"]

models/gc_grt123_lung_cancer/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ RUN buildutils/import_mhub_model.sh gc_grt123_lung_cancer ${MHUB_MODELS_REPO}
3131
ENV PYTHONPATH="/gc_grt123_lung_cancer:/app"
3232

3333
# Default entrypoint
34-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
34+
ENTRYPOINT ["mhub.run"]
3535
CMD ["--config", "/app/models/gc_grt123_lung_cancer/config/default.yml"]

models/gc_lunglobes/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ RUN git clone --depth 1 --branch v1.6.5 https://github.com/DIAGNijmegen/bodyct-p
2424
sed -i 's/from models import CTSUNet/from src.models import CTSUNet/g' src/test.py
2525

2626
# Default run script
27-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
27+
ENTRYPOINT ["mhub.run"]
2828
CMD ["--config", "/app/models/gc_lunglobes/config/default.yml"]

models/gc_nnunet_pancreas/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ RUN buildutils/import_mhub_model.sh gc_nnunet_pancreas ${MHUB_MODELS_REPO}
4141
ENV PYTHONPATH=/opt/algorithm:/app
4242

4343
# Configure main entrypoint
44-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
44+
ENTRYPOINT ["mhub.run"]
4545
CMD ["--config", "/app/models/gc_nnunet_pancreas/config/default.yml"]

models/gc_node21_baseline/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ ENV TORCH_HOME /opt/algorithm
3737
ENV PYTHONPATH "/app:/opt/algorithm"
3838

3939
# Specify default entrypoint
40-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
40+
ENTRYPOINT ["mhub.run"]
4141
CMD ["--config", "/app/models/gc_node21_baseline/config/default.yml"]

models/gc_picai_baseline/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ RUN buildutils/import_mhub_model.sh gc_picai_baseline ${MHUB_MODELS_REPO}
5151
ENV PYTHONPATH="/app:/opt/algorithm"
5252

5353
# Default entrypoint
54-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
54+
ENTRYPOINT ["mhub.run"]
5555
CMD ["--config", "/app/models/gc_picai_baseline/config/default.yml"]

models/gc_spider_baseline/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ ENV PYTHONPATH="/app:/app/src/devel"
3535
ENV VERSEG_BASEDIR="/app/src/"
3636

3737
# Default run script
38-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
38+
ENTRYPOINT ["mhub.run"]
3939
CMD ["--config", "/app/models/gc_spider_baseline/config/default.yml"]

models/gc_stoic_baseline/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ ENV STOIC_SRC_PATH=/app/src
3131
ENV PYTHONPATH=/app:${STOIC_SRC_PATH}
3232

3333
# Default run script
34-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
34+
ENTRYPOINT ["mhub.run"]
3535
CMD ["--config", "/app/models/gc_stoic_baseline/config/default.yml"]

models/gc_tiger_lb2/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ RUN buildutils/import_mhub_model.sh gc_tiger_lb2 ${MHUB_MODELS_REPO}
5151
ENV PYTHONPATH="/vuno:/app"
5252

5353
# Set default entrypoint
54-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
54+
ENTRYPOINT ["mhub.run"]
5555
CMD ["--config", "/app/models/gc_tiger_lb2/config/default.yml"]

models/gc_wsi_bgseg/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ RUN git clone --depth 1 --branch 1.0.0 https://github.com/DIAGNijmegen/pathology
6060
ENV PYTHONPATH="/app:/app/src"
6161

6262
# Default run script
63-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
63+
ENTRYPOINT ["mhub.run"]
6464
CMD ["--config", "/app/models/gc_wsi_bgseg/config/default.yml"]

models/lungmask/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ ENV WEIGHTS_URL="https://github.com/JoHof/lungmask/releases/download/v0.0/unet_l
2020
RUN wget --directory-prefix ${WEIGHTS_DIR} ${WEIGHTS_URL}
2121

2222
# Default run script
23-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
23+
ENTRYPOINT ["mhub.run"]
2424
CMD ["--config", "/app/models/lungmask/config/default.yml"]

models/nnunet_liver/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ RUN rm ${WEIGHTS_DIR}${WEIGHTS_FN}
2828
ENV WEIGHTS_FOLDER=$WEIGHTS_DIR
2929

3030
# Default run script
31-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
31+
ENTRYPOINT ["mhub.run"]
3232
CMD ["--config", "/app/models/nnunet_liver/config/default.yml"]

models/nnunet_pancreas/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ RUN rm ${WEIGHTS_DIR}${WEIGHTS_FN}
2828
ENV WEIGHTS_FOLDER=$WEIGHTS_DIR
2929

3030
# Default run script
31-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
31+
ENTRYPOINT ["mhub.run"]
3232
CMD ["--config", "/app/models/nnunet_pancreas/config/default.yml"]

models/platipy/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ RUN unzip ${WEIGHTS_DIR}${WEIGHTS_FN} -d ${WEIGHTS_DIR}
3939
RUN rm ${WEIGHTS_DIR}${WEIGHTS_FN}
4040

4141
# Default run script
42-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
42+
ENTRYPOINT ["mhub.run"]
4343
CMD ["--config", "/app/models/platipy/config/default.yml"]

models/pyradiomics/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ARG MHUB_MODELS_REPO
99
RUN buildutils/import_mhub_model.sh pyradiomics ${MHUB_MODELS_REPO}
1010

1111
# Default run script
12-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
12+
ENTRYPOINT ["mhub.run"]
1313
CMD ["--config", "/app/models/pyradiomics/config/default.yml"]

models/totalsegmentator/dockerfiles/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ RUN buildutils/download_weights.sh \
2626
https://zenodo.org/record/6802452/files/Task255_TotalSegmentator_part5_ribs_1139subj.zip
2727

2828
# Default run script
29-
ENTRYPOINT ["python3", "-m", "mhubio.run"]
29+
ENTRYPOINT ["mhub.run"]
3030
CMD ["--config", "/app/models/totalsegmentator/config/default.yml"]

0 commit comments

Comments
 (0)