Commit 63aea3cf authored by Roelandt nicolas's avatar Roelandt nicolas

Merge branch 'master' into 'master'

Master

See merge request !1
parents bbd1602e c3e2f267
......@@ -2,7 +2,6 @@
.Rhistory
.RData
.DS_Store
*.tex
*.csv
*.7zip
......
......@@ -46,8 +46,9 @@ RUN ls /templates/
COPY images/ /images/
RUN ls /images/
COPY data/traitees/persona_vivienda_zm_mexico_2015_concentration.csv data/traitees/
RUN ls data/traitees/
## Chargement manuel des CSV contenant les données pré-traitées et filtrées pour limiter la taille de l'image docker
#COPY data/traitees/persona_vivienda_zm_mexico_2015_concentration.csv data/traitees/
#RUN ls data/traitees/
RUN mkdir /liftrroot/
WORKDIR /liftrroot/
......@@ -5,5 +5,5 @@ COPY images/ /images/
RUN ls /images/
## Chargement manuel des CSV contenant les données pré-traitées et filtrées pour limiter la taille de l'image docker
COPY data/traitees/persona_vivienda_zm_mexico_2015_concentration.csv data/traitees/
RUN ls data/traitees/
\ No newline at end of file
#COPY data/traitees/persona_vivienda_zm_mexico_2015_concentration.csv data/traitees/
#RUN ls data/traitees/
\ No newline at end of file
This diff is collapsed.
container_name: liftr_container_36803dfa_7c45_43de_bee8_c950e6099ad6
container_name: liftr_container_c7c9f4c8_916d_4a99_9a60_56c048423398
image_name: document
docker_build_cmd: docker build --no-cache=false --rm=true -t="document" /home/niko/Rstuff/M2_projet_transversal/docs
docker_run_cmd: docker run --rm --name "liftr_container_36803dfa_7c45_43de_bee8_c950e6099ad6"
-u `id -u $USER` -v "/home/niko/Rstuff/M2_projet_transversal/docs:/liftrroot/" document
Rscript -e "library('knitr');library('rmarkdown');library('shiny');setwd('/liftrroot/');render(input
docker_build_cmd: docker build --no-cache=false --rm=true -t="document" /home/niko/Rstuff/rapport/docs
docker_run_cmd: docker run --rm --name "liftr_container_c7c9f4c8_916d_4a99_9a60_56c048423398"
-u `id -u $USER` -v "/home/niko/Rstuff/rapport/docs:/liftrroot/" document Rscript
-e "library('knitr');library('rmarkdown');library('shiny');setwd('/liftrroot/');render(input
= 'document.Rmd')"
No preview for this file type
......@@ -321,7 +321,7 @@
\pgftext[x=1.1cm,y=26.4cm,bottom,left]{\includegraphics[width=4cm]{/images/secondlogo.png}};
% Cover image / project logo
\pgftext[x=18.5cm,y=6.5cm,bottom,right]{\includegraphics[width=9cm]{/images/mainlogo.png}};
\pgftext[x=19.5cm,y=7.5cm,bottom,right]{\includegraphics[width=13cm]{/images/mainlogo.jpg}};
%% Departement / under logo text
%\pgftext[x=1.1cm,y=25.5cm,bottom,left]{\scalebox{0.6}[1]{\fontsize{13}{13}{\fontfamily{ptm}\selectfont{}\makebox[6.7cm][l]{\ugg{\textbf{DEPARTEMENT}}}}}};
......
This diff is collapsed.
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