Commit 66ce374d authored by vbaudrot's avatar vbaudrot

Merge remote-tracking branch 'origin/master'

parents b0e5f31c 77f2f0c7
Pipeline #1886 passed with stages
in 3 minutes and 44 seconds
......@@ -25,7 +25,7 @@ BuildData0:
artifacts:
paths:
- R/list_figure0.rds
expire_in: 1 day
expire_in: 2 days
BuildData1:
<<: *builddata_definition
......@@ -34,7 +34,7 @@ BuildData1:
artifacts:
paths:
- R/list_figure1.rds
expire_in: 1 day
expire_in: 2 days
BuildData2:
<<: *builddata_definition
......@@ -43,7 +43,7 @@ BuildData2:
artifacts:
paths:
- R/list_figure2.rds
expire_in: 1 day
expire_in: 2 days
BuildData3:
<<: *builddata_definition
......@@ -52,7 +52,7 @@ BuildData3:
artifacts:
paths:
- R/list_figure3.rds
expire_in: 1 day
expire_in: 2 days
mergeData:
tags:
......@@ -70,10 +70,11 @@ mergeData:
allow_failure: true
script:
- 'cd R && Rscript main_forecast_plotly.R "merge"'
- "curl --request POST --form token=$TRIGGERTOKEN --form ref=master https://gitlab.paca.inrae.fr/api/v4/projects/105/trigger/pipeline"
artifacts:
paths:
- R/list_figures.rds
expire_in: 1 day
expire_in: 1 week
## Build docker image of the R shiny app
## using DockerFile and register it in the
......@@ -95,7 +96,7 @@ buildImageDocker:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
stage: build_img
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$GENDATA != "gen_data" && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
script:
......@@ -111,7 +112,7 @@ deploy:
image: debian:stable
stage: deploy
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$GENDATA != "gen_data" && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
environment:
......
......@@ -119,7 +119,7 @@ COPY global.R /srv/shiny-server/${APP_NAME}
COPY ui.R /srv/shiny-server/${APP_NAME}
COPY server.R /srv/shiny-server/${APP_NAME}
COPY R/* /srv/shiny-server/${APP_NAME}/R/
COPY www/ /srv/shiny-server/${APP_NAME}/www/
COPY www /srv/shiny-server/${APP_NAME}/www
RUN chown -R shiny.root /srv/shiny-server
......
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