Commit b5c0fcb5 authored by Amine  GHOZLANE's avatar Amine GHOZLANE
Browse files

Reorder and clean

parent 36c3bda6
Pipeline #13910 passed with stage
in 46 minutes and 22 seconds
stages: stages:
- build - build_dev
- build_master
services: services:
- docker:dind - docker:dind
...@@ -8,16 +9,28 @@ variables: ...@@ -8,16 +9,28 @@ variables:
DOCKER_HOST: tcp://localhost:2375 DOCKER_HOST: tcp://localhost:2375
build_master: build_dev:
image: docker:latest image: docker:latest
stage: build stage: build_dev
variables: variables:
CI_DEBUG_TRACE: "false" CI_DEBUG_TRACE: "false"
script: script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- docker build - 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" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
. .
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
\ No newline at end of file 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
...@@ -213,6 +213,17 @@ if(!require("visNetwork")){ ...@@ -213,6 +213,17 @@ if(!require("visNetwork")){
library(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)) { if (!require(devtools)) {
install.packages('devtools', repos="https://cran.univ-paris1.fr/") install.packages('devtools', repos="https://cran.univ-paris1.fr/")
library(devtools) library(devtools)
...@@ -223,11 +234,6 @@ if(!require("shinydashboardshaman")){ ...@@ -223,11 +234,6 @@ if(!require("shinydashboardshaman")){
library(shinydashboardshaman) library(shinydashboardshaman)
} }
if(!require("treeWeightD3")){
devtools::install_github('pierreLec/treeWeightD3')
library(treeWeightD3)
}
if (!require("d3heatmap")) { if (!require("d3heatmap")) {
#devtools::install_github('aghozlane/d3heatmap') #devtools::install_github('aghozlane/d3heatmap')
devtools::install_github("rstudio/d3heatmap") devtools::install_github("rstudio/d3heatmap")
...@@ -241,15 +247,14 @@ if (!require("biomformatshaman")){ ...@@ -241,15 +247,14 @@ if (!require("biomformatshaman")){
library(biomformatshaman) library(biomformatshaman)
} }
if (!require("scatterD3")) { if (!require("rNVD3shaman")) {
#devtools::install_github('aghozlane/scatterD3') devtools::install_github('aghozlane/rNVD3shaman')
install.packages("scatterD3", repos="https://cran.univ-paris1.fr/") library(rNVD3shaman)
library(scatterD3)
} }
if (!require("rNVD3")) { if (!require("DESeq2shaman")) {
devtools::install_github('aghozlane/rNVD3') devtools::install_github("aghozlane/DESeq2shaman")
library(rNVD3) library(DESeq2shaman)
} }
if(!require("PhyloTreeMetaR")){ if(!require("PhyloTreeMetaR")){
...@@ -257,17 +262,12 @@ if(!require("PhyloTreeMetaR")){ ...@@ -257,17 +262,12 @@ if(!require("PhyloTreeMetaR")){
library(PhyloTreeMetaR) library(PhyloTreeMetaR)
} }
if (!require("shinytoastr")){ if(!require("treeWeightD3")){
devtools::install_github("mangothecat/shinytoastr") devtools::install_github('pierreLec/treeWeightD3')
library(shinytoastr) library(treeWeightD3)
} }
if(!require("d3vennR")){ if(!require("d3vennR")){
devtools::install_github("timelyportfolio/d3vennR") devtools::install_github("timelyportfolio/d3vennR")
library(d3vennR) library(d3vennR)
}
if (!require("DESeq2shaman")) {
devtools::install_github("aghozlane/DESeq2shaman")
library(DESeq2shaman)
} }
\ No newline at end of file
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