# HG changeset patch # User fgiacomoni # Date 1606476118 0 # Node ID 2744d20c830a29efae3359fd2ab1514bd0220c6d # Parent de13e2c45971b1931c8aa0b5becb09905eb9f410 " master branch Updating with tag :CI_COMMIT_TAG - - Fxx" diff -r de13e2c45971 -r 2744d20c830a Dockerfile --- a/Dockerfile Tue Jan 21 15:49:00 2020 -0500 +++ b/Dockerfile Fri Nov 27 11:21:58 2020 +0000 @@ -1,4 +1,8 @@ -FROM ubuntu:18.04 +# ref install: ubuntu 20.04 +FROM ubuntu:20.04 + +# init var +ARG DEBIAN_FRONTEND=noninteractive # set author MAINTAINER Franck Giacomoni @@ -36,15 +40,13 @@ RUN cpan install ExtUtils::MakeMaker && \ cpan install File::ShareDir::Install && \ - cpan install Module::Release &&\ - cpan install Archive::Zip &&\ - + cpan install Module::Release && \ + cpan install Archive::Zip && \ apt -y install git &&\ - apt -y install python2.7 python-pip &&\ - apt -y install virtualenv &&\ - pip install "pip>=7" &&\ - pip install -U git+git://github.com/galaxyproject/planemo.git &&\ - + apt -y install python3 python3-pip && \ + apt -y install virtualenv && \ + pip install "pip>=7" && \ + pip install -U git+git://github.com/galaxyproject/planemo.git && \ apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff -r de13e2c45971 -r 2744d20c830a bih4maconda.pl --- a/bih4maconda.pl Tue Jan 21 15:49:00 2020 -0500 +++ b/bih4maconda.pl Fri Nov 27 11:21:58 2020 +0000 @@ -61,9 +61,7 @@ ## Dedicate Perl Modules (Home made...) use Metabolomics::Fragment::Annotation qw( :all ) ; use Metabolomics::Banks qw( :all ) ; -use Metabolomics::Banks::BloodExposome qw( :all ) ; use Metabolomics::Banks::MaConDa qw( :all ) ; -use Metabolomics::Banks::AbInitioFragments qw( :all ) ; use Metabolomics::Utils qw( :all ) ; ## Initialized values diff -r de13e2c45971 -r 2744d20c830a bih4maconda.xml --- a/bih4maconda.xml Tue Jan 21 15:49:00 2020 -0500 +++ b/bih4maconda.xml Fri Nov 27 11:21:58 2020 +0000 @@ -1,9 +1,9 @@ - + : Utility to detect potential contaminants in your peak list based on MaConDa database - perl-metabolomics-fragment-annotation + perl-metabolomics-fragment-annotation @@ -56,13 +56,26 @@ - + + + + + + + + + + + + + +