From 56bd0aa934e2722a053f2f76187f2c42e1f65ec3 Mon Sep 17 00:00:00 2001 From: Orestis <orestis.malaspinas@pm.me> Date: Thu, 9 Mar 2023 16:49:11 +0100 Subject: [PATCH] added docker compose --- slides/Makefile | 17 ++--------------- slides/docker-compose.yml | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 slides/docker-compose.yml diff --git a/slides/Makefile b/slides/Makefile index d20caa4..0f4b15f 100644 --- a/slides/Makefile +++ b/slides/Makefile @@ -8,15 +8,6 @@ PDFOPTIONS += -V themeoptions:numbering=none -V themeoptions:progressbar=foot PDFOPTIONS += -V fontsize=smaller PDFOPTIONS += -V urlcolor=blue -REVEALOPTIONS = -t revealjs -REVEALOPTIONS += -F mermaid-filter -REVEALOPTIONS += --self-contained -REVEALOPTIONS += -V revealjs-url=reveal.js -REVEALOPTIONS += -V theme=white -REVEALOPTIONS += -V width=1920 -REVEALOPTIONS += -V margin=0 -REVEALOPTIONS += --slide-level=1 - MD=$(wildcard *.md) # Tous les fichiers .md PDF=$(MD:%.md=%.pdf) # Pour les fichier pdf on transforme .md -> .pdf HTML=$(MD:%.md=%.html) # Pour les fichier html on transforme .md -> .html @@ -27,11 +18,10 @@ all: puppeteer $(PDF) # all: puppeteer $(PDF) $(HTML) # La cible par défaut (all) exécute les cibles %.pdf docker: docker-compose.yml - docker-compose run slides make puppeteer -k || true - docker-compose run slides make all -k || true + docker-compose run slides docker_clean: docker-compose.yml - docker-compose run slides make clean -k || true + docker-compose run slides clean puppeteer: @echo "Setting chromium to $(CHROMIUM) for puppeteer" @@ -48,9 +38,6 @@ markdown: $(MARKDOWN) # La markdown les cibles %.markdown %.pdf: %.md metadata.yaml # %.pdf (chaque fichier %.md génère un fichier avec le même nom mais l'extension .pdf et la dépendance metadata.yaml) pandoc -s $(OPTIONS) $(PDFOPTIONS) -o $@ $^ -%.html: %.md metadata.yaml - pandoc -s $(OPTIONS) $(REVEALOPTIONS) -o $@ $^ - %.markdown: %.md metadata.yaml yq sed '1 { /^---/ { :a N; /\n---/! ba; d} }' $< > no_header grep -v -F -x -f no_header $< > header.yaml diff --git a/slides/docker-compose.yml b/slides/docker-compose.yml new file mode 100644 index 0000000..c7f3c95 --- /dev/null +++ b/slides/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.3" +services: + slides: + #To use dockerfile : build: . + image: omalaspinas/c_pandoc:latest + environment: + USER: 1000 + GROUP: 1000 + container_name: slides + volumes: + - ./:/data + entrypoint: ["make"] + # command: "make" + working_dir: /data + # user: "$(id -u):$(id -g)" -- GitLab