Commit b43d2d28 authored by LANORE Vincent's avatar LANORE Vincent
Browse files

Updated diffsel docker + improved Dockerfile so it doesn't cache git clone +...

Updated diffsel docker + improved Dockerfile so it doesn't cache git clone + changed image name in pipeline.
parent 8a17aa45
......@@ -6,7 +6,8 @@ MAINTAINER Vincent Lanore vincent.lanore@gmail.com
RUN apt-get update && apt-get -qy --no-install-recommends install git make cmake clang ca-certificates curl
# getting diffsel
RUN git clone https://github.com/vlanore/diffsel.git
ADD https://api.github.com/repos/vlanore/diffsel/git/refs/heads/master version.json
RUN git clone -bmaster https://github.com/vlanore/diffsel.git
WORKDIR /diffsel
# compiling
......
......@@ -4,7 +4,7 @@ set -e
IMAGE_NAME=diffsel
DOCKERFILE_DIR=.
TAG=v1.0
TAG=master_2304
REPO=vlanore/$IMAGE_NAME:$TAG
docker build -t $REPO -f ./Dockerfile $DOCKERFILE_DIR
......
......@@ -58,7 +58,7 @@ let check_conv run_diffsel : text_file directory workflow =
]
let selector run_diffsel : text_file workflow =
let env = docker_image ~account:"vlanore" ~name:"diffsel" ~tag:"v1.0" () in
let env = docker_image ~account:"vlanore" ~name:"diffsel" ~tag:"master_2304" () in
let package = tmp // "diffsel_script_utils.py" in
let script = tmp // "diffsel_analyze_result.py" in
let tmp_tree = tmp // "myrun.tree" in
......
......@@ -207,7 +207,7 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
| `Pcoc_gamma -> `Pcoc_gamma (Pcoc.pcoc ~catx_est:10 ~plot_complete: true ~gamma:true ~faa ~tree:tree_sc)
| `Pcoc_C60 -> `Pcoc_C60 (Pcoc.pcoc ~catx_est:60 ~plot_complete: true ~gamma:false ~faa ~tree:tree_sc)
| `Tdg09 -> `Tdg09 (Tamuri.tdg09 ~faa ~tree:tree_sc)
| `Diffsel -> `Diffsel (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles ~id:1 ~tag:"v1.0" )
| `Diffsel -> `Diffsel (Diffsel.diffsel ~phy_n ~tree:diffsel_tree ~w_every ~n_cycles ~id:1 ~tag:"master_2304" )
| `Identical_LG -> `Identical_LG (Identical.identical ~faa ~tree_id ~tree_sc ~prot_model:"LG08")
| `Identical_WAG -> `Identical_WAG (Identical.identical ~faa ~tree_id ~tree_sc ~prot_model:"WAG01")
| `Topological_LG -> `Topological_LG (Topological.topological ~faa ~tree:tree_id ~tree_conv ~prot_model:"LG08")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment