diff --git a/bin/prezbuilder-docker b/bin/prezbuilder-docker index 502a4937541fde5ba6aac5879e8aca0a01a67dec..880bc140fc8644769617d81ea79a509bed6afd16 100755 --- a/bin/prezbuilder-docker +++ b/bin/prezbuilder-docker @@ -7,5 +7,5 @@ exec docker run \ -v `readlink -f ${3:-public}`:/workdir/public \ -p 3000:3000/tcp \ -p 35729:35729/tcp \ - "${PREZBUILDER_IMAGE:-gitlab-registry.irstea.fr/pole-is/tools/prezbuilder}:${PREZBUILDER_TAG:-master}" \ + "${PREZBUILDER_IMAGE:-gitlab-registry.irstea.fr/pole-is/tools/prezbuilder}:${PREZBUILDER_TAG:-1.1.0}" \ "${1:-build}" /workdir/src /workdir/public diff --git a/prezbuilder-ci.yml b/prezbuilder-ci.yml index 72cc1d02218ecf87e0445069a60ca45725a59fcc..a16f49282f0500e041534bde16ccb93dc8f2dfea 100644 --- a/prezbuilder-ci.yml +++ b/prezbuilder-ci.yml @@ -5,7 +5,7 @@ tags: [docker] variables: PREZBUILDER_IMAGE: gitlab-registry.irstea.fr/pole-is/tools/prezbuilder - PREZBUILDER_TAG: master + PREZBUILDER_TAG: 1.1.0 PREZBUILDER_SRC: src image: name: "${PREZBUILDER_IMAGE}:${PREZBUILDER_TAG}" diff --git a/src/index.md b/src/index.md index 7bca240fec1d28906f5dee63951a7b6ff415d4a0..7c907c5e78b79fda790adbfca085f612cae52177 100644 --- a/src/index.md +++ b/src/index.md @@ -1,4 +1,4 @@ -% prezbuilder master +% prezbuilder 1.1.0 % Guillaume Perréal % 2020-05 @@ -19,7 +19,7 @@ La présentation que vous regardez a été générée avec prezbuilder ! ## Avec Docker -L'image gitlab-registry.irstea.fr/pole-is/tools/prezbuilder:master contient +L'image gitlab-registry.irstea.fr/pole-is/tools/prezbuilder:1.1.0 contient une version préinstallée de prezbuilder avec pandoc et wkhtmltopdf, _mais pas drawio_. @@ -32,7 +32,7 @@ docker login gitlab-registry.irstea.fr Ensuite, le plus simple est de récupérer le script `prezbuilder-docker` : ```console -sudo wget https://gitlab.irstea.fr/pole-is/tools/prezbuilder/-/raw/master/bin/prezbuilder-docker?inline=false -O /usr/local/bin/prezbuilder-docker +sudo wget https://gitlab.irstea.fr/pole-is/tools/prezbuilder/-/raw/1.1.0/bin/prezbuilder-docker?inline=false -O /usr/local/bin/prezbuilder-docker sudo chmod a+rx /usr/local/bin/prezbuilder-docker ``` @@ -47,7 +47,7 @@ graphes drawio. ```yaml include: - project: pole-is/tools/prezbuilder - ref: master + ref: 1.1.0 file: prezbuilder-ci.yml pages: