From d357cae89d56d5ca611fb3dc2ff88380368980de Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sat, 19 Feb 2022 21:17:16 +0100
Subject: [PATCH] updated makefile and docker compose
---
slides/Makefile | 9 ++++++---
slides/docker-compose.yml | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/slides/Makefile b/slides/Makefile
index 89363fd..1128eb1 100644
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -21,11 +21,12 @@ 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
MARKDOWN=$(MD:%.md=%.markdown) # Pour les fichier markdown on transforme .md -> .markdown
-CHROMIUM:=$(shell which chromium)
+CHROMIUM:=$(shell which chromium || which chromium-browser)
-all: $(PDF) $(HTML) # La cible par défaut (all) exécute les cibles %.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_clean: docker-compose.yml
@@ -63,4 +64,6 @@ deploy: all
cp *.pdf algo_cours
clean:
- rm -f *.pdf *.markdown yq_linux_amd64* index.md
+ rm -f *.pdf *.markdown yq_linux_amd64* index.md .puppeteer.json
+
+.PHONY: clean index puppeteer yq
diff --git a/slides/docker-compose.yml b/slides/docker-compose.yml
index 36c90f3..d212b42 100644
--- a/slides/docker-compose.yml
+++ b/slides/docker-compose.yml
@@ -9,6 +9,6 @@ services:
container_name: slides
volumes:
- ./:/data
- entrypoint: ["make", "all"]
+ # entrypoint: ["make", "all"]
working_dir: /data
# user: "$(id -u):$(id -g)"
--
GitLab