diff --git a/Dockerfile b/Dockerfile index b7b5cb8620144a061954d9ee215054ca063b7771..4c7087e29860b4212a14918a2d46dbd0dfc81514 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ RUN apt-get update -qq && apt-get install -y -qq \ build-essential \ libz-dev \ ncbi-blast+ \ + curl \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* # KMA @@ -41,6 +42,19 @@ RUN mkdir -p /db \ ENV CGE_RESFINDER_RESGENE_DB=/db/resfinder_db/ ENV CGE_RESFINDER_RESPOINT_DB=/db/pointfinder_db/ ENV CGE_DISINFINDER_DB=/db/disinfinder_db/ -RUN pip install -U biopython==1.73 tabulate cgecore \ - && pip install --no-cache-dir resfinder +RUN pip install -U biopython==1.73 tabulate \ + && curl -sSL https://pdm-project.org/install-pdm.py | python3 - \ + && git -C /usr/src/ clone --depth 1 https://bitbucket.org/genomicepidemiology/cgecore.git \ + && cd /usr/src/cgecore && python3 setup.py install \ + && git -C /usr/src/ clone --depth 1 https://bitbucket.org/genomicepidemiology/cgelib.git \ + && cd /usr/src/cgelib && python3 setup.py install \ + && git -C /usr/src/ clone --depth 1 https://bitbucket.org/genomicepidemiology/resfinder.git \ + && cd /usr/src/resfinder && /root/.local/bin/pdm build && pip3 install dist/*.whl + +#RUN pip install -U biopython==1.73 tabulate cgecore \ +# && pip install --no-cache-dir resfinder + + + + diff --git a/Readme.md b/Readme.md index befcbe21fbf052075bf5c28deff1dafa045a2e13..e1058cac63f2bf0d5098683eed3f79732b97a8b8 100644 --- a/Readme.md +++ b/Readme.md @@ -3,7 +3,7 @@ # Introduction `cgetools` is s docker container with an installation of several -(CGE)[https://bitbucket.org/genomicepidemiology/] softwares and associated +[CGE]([https://bitbucket.org/genomicepidemiology/]) softwares and associated databases (mlst,plasmidfinder,resfinder). @@ -14,7 +14,7 @@ To use the tool, you need to mount the working directory on `/cwd`. Example: ```bash docker run --rm -v .:/cwd unigebsp/cgetools plasmidfinder.py docker run --rm -v .:/cwd unigebsp/cgetools mlst.py -docker run --rm -v .:/cwd unigebsp/cgetools resfinder.py +docker run --rm -v .:/cwd unigebsp/cgetools python3 -m resfinder ```