Reorder and clean

.gitlab-ci.yml

 stages:
-  - build
+  - build_dev
+  - build_master
 
 services:
   - docker:dind
@@ -8,16 +9,28 @@ variables:
   DOCKER_HOST: tcp://localhost:2375
 
 
-build_master:
+build_dev:
   image: docker:latest
-  stage: build
+  stage: build_dev
   variables:
     CI_DEBUG_TRACE: "false"
   script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - docker build 
-      --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-      --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
       --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
       .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
\ No newline at end of file
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+  only:
+    - dev
+
+build_master:
+  image: docker:latest
+  stage: build_master
+  variables:
+    CI_DEBUG_TRACE: "false"
+  script:
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+    - docker build -t aghozlane/shaman .
+    - docker push -t aghozlane/shaman
+  only:
+    - master
\ No newline at end of file

LoadPackages.R

@@ -213,6 +213,17 @@ if(!require("visNetwork")){
   library(visNetwork)
 }
 
+if (!require("shinytoastr")){
+  install.packages("shinytoastr")
+  library(shinytoastr)
+}
+
+if (!require("scatterD3")) {
+  #devtools::install_github('aghozlane/scatterD3')
+  install.packages("scatterD3", repos="https://cran.univ-paris1.fr/")
+  library(scatterD3)
+}
+
 if (!require(devtools)) {
   install.packages('devtools',  repos="https://cran.univ-paris1.fr/")
   library(devtools)
@@ -223,11 +234,6 @@ if(!require("shinydashboardshaman")){
   library(shinydashboardshaman)
 }
 
-if(!require("treeWeightD3")){
-  devtools::install_github('pierreLec/treeWeightD3')
-  library(treeWeightD3)
-}
-
 if (!require("d3heatmap")) {
   #devtools::install_github('aghozlane/d3heatmap')
   devtools::install_github("rstudio/d3heatmap")
@@ -241,15 +247,14 @@ if (!require("biomformatshaman")){
   library(biomformatshaman)
 }
 
-if (!require("scatterD3")) {
-  #devtools::install_github('aghozlane/scatterD3')
-  install.packages("scatterD3", repos="https://cran.univ-paris1.fr/")
-  library(scatterD3)
+if (!require("rNVD3shaman")) {
+  devtools::install_github('aghozlane/rNVD3shaman')
+  library(rNVD3shaman)
 }
 
-if (!require("rNVD3")) {
-  devtools::install_github('aghozlane/rNVD3')
-  library(rNVD3)
+if (!require("DESeq2shaman")) {
+  devtools::install_github("aghozlane/DESeq2shaman")
+  library(DESeq2shaman)
 }
 
 if(!require("PhyloTreeMetaR")){
@@ -257,17 +262,12 @@ if(!require("PhyloTreeMetaR")){
   library(PhyloTreeMetaR)
 }
 
-if (!require("shinytoastr")){
-  devtools::install_github("mangothecat/shinytoastr")
-  library(shinytoastr)
+if(!require("treeWeightD3")){
+  devtools::install_github('pierreLec/treeWeightD3')
+  library(treeWeightD3)
 }
 
 if(!require("d3vennR")){
   devtools::install_github("timelyportfolio/d3vennR")
   library(d3vennR)
-}
-
-if (!require("DESeq2shaman")) {
-  devtools::install_github("aghozlane/DESeq2shaman")
-  library(DESeq2shaman)
 }
\ No newline at end of file