Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VEBER Philippe
codepi
Commits
4f014a6f
Commit
4f014a6f
authored
Jul 17, 2018
by
Carine Rey
Browse files
rename docker image
parent
613f233d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
5 deletions
+6
-5
etc/docker/python_basics/Dockerfile
etc/docker/python_basics/Dockerfile
+2
-0
etc/docker/python_basics/build_docker.sh
etc/docker/python_basics/build_docker.sh
+2
-2
etc/docker/r_basics/Dockerfile
etc/docker/r_basics/Dockerfile
+0
-0
etc/docker/r_basics/build_docker.sh
etc/docker/r_basics/build_docker.sh
+0
-0
lib/convergence_detection.ml
lib/convergence_detection.ml
+1
-2
lib/tree_dataset.ml
lib/tree_dataset.ml
+1
-1
No files found.
etc/docker/
ete3
/Dockerfile
→
etc/docker/
python_basics
/Dockerfile
View file @
4f014a6f
...
...
@@ -22,4 +22,6 @@ RUN apt-get update && \
RUN
pip
install
--upgrade
pip
RUN
pip
install
ete3
==
3.0.0b35
RUN
pip
install
scipy
==
0.19.1
RUN
pip
install
biopython
==
1.72
etc/docker/
ete3
/build_docker.sh
→
etc/docker/
python_basics
/build_docker.sh
View file @
4f014a6f
...
...
@@ -2,9 +2,9 @@
set
-e
IMAGE_NAME
=
ete3
IMAGE_NAME
=
python_basics
DOCKERFILE_DIR
=
.
TAG
=
3.0.0b35
TAG
=
07172018
REPO
=
carinerey/
$IMAGE_NAME
:
$TAG
docker build
-t
$REPO
-f
./Dockerfile
$DOCKERFILE_DIR
...
...
etc/docker/r/Dockerfile
→
etc/docker/r
_basics
/Dockerfile
View file @
4f014a6f
File moved
etc/docker/r/build_docker.sh
→
etc/docker/r
_basics
/build_docker.sh
View file @
4f014a6f
File moved
lib/convergence_detection.ml
View file @
4f014a6f
...
...
@@ -40,7 +40,7 @@ type dataset_res = {
}
let
merge_results
~
res_by_tools
:
text_file
workflow
=
let
env
=
docker_image
~
account
:
"carinerey"
~
name
:
"
ete3"
~
tag
:
"3.0.0b35
"
()
in
let
env
=
docker_image
~
account
:
"carinerey"
~
name
:
"
python_basics"
~
tag
:
"07172018
"
()
in
let
command
=
List
.
map
res_by_tools
~
f
:
(
fun
res
->
let
w
=
match
res
with
|
`Pcoc
d
->
Pcoc
.
results
d
...
...
@@ -79,7 +79,6 @@ let merge_results ~res_by_tools : text_file workflow =
let
plot_merge_results
~
plot_all_sites
~
(
res_by_tools
:
result
list
)
~
tree
~
faa
~
tsv
:
svg
workflow
=
(*let env = docker_image ~account:"carinerey" ~name:"ete3" ~tag:"3.0.0b35" () in*)
let
env
=
docker_image
~
account
:
"carinerey"
~
name
:
"pcoc"
~
tag
:
"06212018"
()
in
(* use of pcoc env due to its working X server for dra plot with ete3 *)
let
meths
=
List
.
map
res_by_tools
~
f
:
(
fun
res
->
...
...
lib/tree_dataset.ml
View file @
4f014a6f
...
...
@@ -3,7 +3,7 @@ open Bistro.EDSL
open
Bistro
.
Std
open
File_formats
let
env
=
docker_image
~
account
:
"carinerey"
~
name
:
"
ete3:3.0.0b35
"
()
let
env
=
docker_image
~
account
:
"carinerey"
~
name
:
"
python_basics"
~
tag
:
"07172018
"
()
let
prepare
tree
=
workflow
~
descr
:
"utils.parse_input_tree"
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment