Skip to content

Commit

Permalink
fixing docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
Thys3Potgieter committed Aug 22, 2023
1 parent c0340c5 commit 44a56cd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
5 changes: 5 additions & 0 deletions docker/bio/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,9 @@ ENV PATH=/home/bio/miniconda3/bin:${PATH}
ENV PYTHONPATH $PYTHONPATH::/home/bio/lib
ENV PATH $PATH::/home/bio/bin/python:/home/bio/bin/R:/home/bio/bin/bash:/home/bio/bin/python:/home/bio/bin/perl

USER root
RUN conda init
ENV PATH=/home/bio/miniconda3/bin:${PATH}
ENV PYTHONPATH $PYTHONPATH::/home/bio/lib
ENV PATH $PATH::/home/bio/bin/python:/home/bio/bin/R:/home/bio/bin/bash:/home/bio/bin/python:/home/bio/bin/perl

2 changes: 1 addition & 1 deletion docker/bio/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

# Change build context to the root of the directory
version=v3.0.17
version=v3.0.19
name=bio
docker pull thyscbio/${name}:${version} && echo "version exists" && exit 1 || echo "Gonna build."
cd ../..
Expand Down
2 changes: 1 addition & 1 deletion docker/mqproteogenomics/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FROM thyscbio/bio:v2.10
FROM thyscbio/bio:v3.0.9
FROM thyscbio/bio:v3.0.17

# samtools etc
#RUN apt-get update && apt-get install -y libssl-dev openssl
Expand Down
8 changes: 2 additions & 6 deletions docker/mqproteogenomics/dev.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
#!/bin/bash
set -a
version=v3.0.16
version=v3.0.19

home=/home/$(who -m | awk '{print $1;}')
config=${home}/.proteomics-pipelines_profile
source $config

DEV_PYTHONPATH=${PROTEOMICS_PIPELINES_PATH}/lib/

DEV_PATH="$PATH::${PROTEOMICS_PIPELINES_PATH}/bin/python/:${PROTEOMICS_PIPELINES_PATH}/bin/R:${PROTEOMICS_PIPELINES_PATH}/bin/bash/:${PROTEOMICS_PIPELINES_PATH}/bin/perl/"

docker run -it --rm -p 8181:9090 -e PYTHONPATH=${DEV_PYTHONPATH} -e PATH=${DEV_PATH} -v ${CBIO_PROTEOGENOMICS_TESTS_PATH}:${CBIO_PROTEOGENOMICS_TESTS_PATH} -v ${PROTEOMICS_PIPELINES_PATH}:${PROTEOMICS_PIPELINES_PATH} thyscbio/bio:${version} /bin/bash
docker run -it --rm -p 8181:9090 -v ${CBIO_PROTEOGENOMICS_TESTS_PATH}:${CBIO_PROTEOGENOMICS_TESTS_PATH} -v ${PROTEOMICS_PIPELINES_PATH}/bin:/home/bio/bin -v ${PROTEOMICS_PIPELINES_PATH}/lib:/home/bio/lib thyscbio/bio:${version} /bin/bash

0 comments on commit 44a56cd

Please sign in to comment.