Utiliser une variable d’environnement

This reverts commit 0c09b27b8e.

hooks/build/latex-compiler/compile

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+pushd /src
+./build
+popd

hooks/build/marp-compiler/compile

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd /src
+./build

hooks/build/texlive/xelatex

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+pushd /src
+document_root=${PROJECT}
+for tex in ./presentations/${document_root}/*.tex
+do
+    rubber --inplace -c shell_escape --unsafe --module=xelatex "$tex"
+    cp "${tex%.tex}.pdf" /dist/
+    # faire quelque chose pour le programme de la formation
+done
+popd
+

hooks/containerbuild/doc-compiler/basic-env

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'RUN mkdir -p /dist/public' >> Dockerfile
+echo 'RUN mkdir -p /dist/private' >> Dockerfile
+echo 'ENV PUBLIC_OUTPUT=/dist/public' >> Dockerfile
+echo 'ENV PRIVATE_OUTPUT=/dist/private' >> Dockerfile

hooks/containerbuild/latex-compiler/add-packages

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'ENV DEBIAN_FRONTEND=noninteractive' >> Dockerfile
+echo 'RUN apt update && apt dist-upgrade --yes && apt clean all' >> Dockerfile
+echo 'RUN apt update && apt install --yes make' >> Dockerfile
+echo 'RUN apt update && apt install --yes python3-setuptools python3-pygments fonts-liberation fonts-liberation2 && apt clean all' >> Dockerfile
+echo 'RUN apt update && apt install --yes texlive-full rubber && apt clean all' >> Dockerfile
+echo 'RUN apt update && apt install --yes curl && apt clean all' >> Dockerfile
+echo 'ENV DEBIAN_FRONTEND=' >> Dockerfile
+

hooks/containerbuild/latex-compiler/add-resources

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+
+if [ -e './datasets/fonts' ]
+then
+for font_file in $(find . -wholename "./datasets/fonts/*.ttf")
+do
+echo 'COPY datasets/fonts/$font_file /root/.fonts/$font_file' >> Dockerfile
+done
+fi
+exit 0

hooks/containerbuild/latex-compiler/basic-environment

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'RUN apk update && apk upgrade' >> Dockerfile
+echo 'RUN apk add --no-cache git' >> Dockerfile

hooks/containerbuild/latex-compiler/latex-environment

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'RUN apk add --no-cache py3-setuptools py3-pygments font-liberation texlive-full' >> Dockerfile

hooks/containerbuild/latex-compiler/marp-environment

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'ENV NODE_VERSION 16.16.0' >> Dockerfile
+echo 'ENV YARN_VERSION 1.22.19' >> Dockerfile
+echo 'ENV ARCH x64' >> Dockerfile
+echo 'ENV CHECKSUM 2b74f0baaaa931ffc46573874a7d7435b642d28f1f283104ac297499fba99f0a' >> Dockerfile
+echo 'RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && apk add --no-cache libstdc++ && apk add --no-cache --virtual .build-deps curl' >> Dockerfile
+echo 'RUN curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; echo "$CHECKSUM  node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner && ln -s /usr/local/bin/node /usr/local/bin/nodejs && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" && apk del .build-deps && node --version && npm --version' >> Dockerfile
+echo 'RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar && for key in 6A010C5166006599AA17F08146C2130DFD2497F5 ; do gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; done  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz && mkdir -p /opt && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz && apk del .build-deps-yarn && yarn --version' >> Dockerfile
+
+echo 'RUN apk update && apk upgrade' >> Dockerfile
+echo 'RUN apk add --no-cache grep chromium freetype libstdc++ harfbuzz ttf-liberation font-noto-cjk font-noto-devanagari font-noto-arabic font-noto-bengali nss wayland-dev su-exec' >> Dockerfile
+echo 'RUN addgroup -S marp && adduser -S -g marp marp && mkdir -p /home/marp/app /home/marp/.cli && chown -R marp:marp /home/marp' >> Dockerfile
+echo 'USER marp' >> Dockerfile
+echo 'ENV CHROME_PATH /usr/bin/chromium-browser' >> Dockerfile
+echo 'RUN git clone https://github.com/marp-team/marp-cli.git /home/marp/.cli' >> Dockerfile
+echo 'WORKDIR /home/marp/.cli' >> Dockerfile
+echo 'RUN git checkout v2.0.4' >> Dockerfile
+echo 'RUN ls .' >> Dockerfile
+echo 'RUN yarn add @babel/core' >> Dockerfile
+echo 'RUN yarn install --production --frozen-lockfile && yarn cache clean && node marp-cli.js --version' >> Dockerfile

hooks/containerbuild/marp-compiler/add-packages

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'RUN apk add --no-cache python3 bash' >> Dockerfile
+echo 'ENTRYPOINT [""]' >> Dockerfile
+echo 'RUN npm install -g --save-prod markdown-it markdown-it-mark markdown-it-include markdown-it-anchor markdown-it-table-of-contents' >> Dockerfile
+echo 'ENV NODE_PATH=/usr/local/lib/node_modules' >> Dockerfile

hooks/containerbuild/marp-compiler/add-resources

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+
+if [ -e './datasets/fonts' ]
+then
+for font_file in $(find . -wholename "./datasets/fonts/*.ttf")
+do
+echo 'COPY datasets/fonts/$font_file /root/.fonts/$font_file' >> Dockerfile
+done
+fi
+exit 0

hooks/containerbuild/texlive/add-packages

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'ENV DEBIAN_FRONTEND=noninteractive' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes texlive-full' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes make' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes fonts-liberation fonts-liberation2' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes python3-setuptools python-setuptools python3-pygments python-pygments' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes rubber' >> Dockerfile
+echo 'ENV DEBIAN_FRONTEND=' >> Dockerfile

hooks/containerbuild/texlive/add-ressources

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+
+if [ -e './datasets/fonts' ]
+then
+for font_file in $(find . -wholename "./datasets/fonts/*.ttf")
+do
+echo 'COPY datasets/fonts/$font_file /root/.fonts/$font_file' >> Dockerfile
+done
+fi
+exit 0
+

hooks/postbuild/common/done

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+tamarin_success "Done :-)"

hooks/postbuild/doc-compiler/export-dist

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Create new directory
+mkdir -p /dist
+
+# Move generated files
+pushd /src
+ls -l ./output_public
+cp ./output_public/*.pdf /dist/public
+cp ./output_private/*.pdf /dist/private
+popd
+
+tamarin_success "Done :-)"
+

hooks/postbuild/texlive/export-dist

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function move_output_to_dist {
+  find . -name "$1" -type f -print0 | xargs -0r mv -t /dist/
+}
+
+# Create new directory
+mkdir -p /dist
+
+# Move generated files
+move_output_to_dist "*.pdf"
+
+tamarin_success "Done :-)"

hooks/prebuild/eole/create-changelog

@@ -63,10 +63,10 @@ function parse_tag {
   extended_version="${tag##*/}"
   if [ "$flavor" = "pkg" ]
   then
-    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.+]\+\)-\([0-9]\+\)\(-[a-z]\++[0-9]\+\)\?\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 revision:\2 modification:\3 distance:\5 anchor:\6/")"
+    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.]\+\)-\([0-9]\+\)\(-[a-z]\++[0-9]\+\)\?\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 revision:\2 modification:\3 distance:\5 anchor:\6/")"
   elif [ "$flavor" = "release" ]
   then
-    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.+]\+\)\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 distance:\3 anchor:\4/")"
+    exploded_version="$(echo $extended_version | sed "s/\([a-z0-9.]\+\)\(-\([0-9]\+\)-\(g[a-z0-9]\+\)\)\?$/version:\1 distance:\3 anchor:\4/")"
   fi
   echo $exploded_version
 }

lib/tamarin.py

@@ -55,6 +55,10 @@ def get_workspace_subdir(subdir):
     os.makedirs(dir_path, exist_ok=True)
     return dir_path
 
+def get_datasets_dir():
+    return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../datasets")
+
+
 def run(cmd, captureOutput=False, pty=False, debug=False, **kwargs):
     """Execute an arbitrary command on the system"""
     if debug:

package

@@ -74,6 +74,8 @@ if __name__ == "__main__":
     # Verify project directory
     project_dir = os.path.abspath(args.project_directory)
     output_dir = os.path.abspath(args.output)
+    if not os.path.exists(output_dir):
+        os.mkdir(output_dir)
 
     # Load build profile
     profile = tamarin.load_profile(args.profile, debug=args.debug)
@@ -84,7 +86,7 @@ if __name__ == "__main__":
     build_workspace = tamarin.get_workspace_subdir('tmp/build_{:d}'.format(pid))
 
     shutil.copytree(tamarin.get_utils_dir(), os.path.join(build_workspace, 'utils'))
-
+    shutil.copytree(tamarin.get_datasets_dir(), os.path.join(build_workspace, 'datasets'))
     base_image = args.base if args.base != '' else profile['profile']['default_image']
 
     image_tag = build_image(build_workspace, base_image, args.profile, profile,  debug=args.debug, rebuild=args.rebuild)
@@ -108,16 +110,17 @@ if __name__ == "__main__":
 
         # volumes definition
         docker_args += [
-            "-v", "{:s}:/src:ro".format(project_dir),
-            "-v", "{:s}:/dist".format(output_dir),
+            "-v", "{:s}:/src:z,ro".format(project_dir),
+            "-v", "{:s}:/dist:z".format(output_dir),
+            "-v", "{:s}:/tamarin/datasets:z".format(tamarin.get_datasets_dir()),
         ]
 
         if not args.no_lib_mounts:
             docker_args += [
-                "-v", "{:s}:/tamarin/hooks:ro".format(tamarin.get_hooks_dir()),
-                "-v", "{:s}:/tamarin/lib:ro".format(tamarin.get_lib_dir()),
-                "-v", "{:s}:/tamarin/profiles:ro".format(tamarin.get_profiles_dir()),
-                "-v", "{:s}:/tamarin/utils:ro".format(tamarin.get_utils_dir())
+                "-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir()),
+                "-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir()),
+                "-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir()),
+                "-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir())
             ]
 
         # Use environment proxy if defined

profiles/debian.conf

@@ -1,7 +1,7 @@
 # Configuration générale du profil
 [profile]
 # Image Docker par défaut
-default_image=reg.cadoles.com/proxy_cache/library/debian:bookworm
+default_image=debian:stretch
 
 # Configuration de l'étape de pré-construction du conteneur
 [containerbuild]

profiles/eole-2.9.0.conf

@@ -8,7 +8,6 @@ default_image=ubuntu:jammy
 hooks=
   containerbuild/debian/install-build-essential,
   containerbuild/debian/install-git,
-  containerbuild/eole-2.9.0/configure-additional-repository,
 
 # Configuration de l'étape de pré-construction du paquet
 [prebuild]

profiles/latex-compiler.conf

@@ -0,0 +1,27 @@
+# Configuration générale du profil
+[profile]
+# Image Docker par défaut
+default_image=ubuntu:jammy
+
+# Configuration de l’étape de pré-construction du conteneur
+[containerbuild]
+hooks=
+  containerbuild/latex-compiler/add-packages,
+  containerbuild/latex-compiler/add-resources,
+
+# Configuration de l’étape de pré-compilation des documents
+[prebuild]
+hooks=
+  prebuild/debian/copy-sources-to-workspace,
+  prebuild/debian/run-project-hooks,
+  prebuild/debian/load-project-db,
+
+# Configuration de l’étape de compilation du document
+[build]
+hooks=build/latex-compiler/compile
+
+# Configuration de l’étape de post-compilation du document
+[postbuild]
+hooks=
+  postbuild/debian/run-project-hooks,
+  postbuild/doc-compiler/export-dist,

profiles/marp-compiler.conf

@@ -0,0 +1,28 @@
+# Configuration générale du profil
+[profile]
+# Image Docker par défaut
+default_image=marpteam/marp-cli:latest
+
+# Configuration de l’étape de pré-construction du conteneur
+[containerbuild]
+hooks=
+  containerbuild/doc-compiler/basic-env,
+  containerbuild/marp-compiler/add-packages,
+  containerbuild/marp-compiler/add-resources,
+
+# Configuration de l’étape de pré-compilation des documents
+[prebuild]
+hooks=
+  prebuild/debian/copy-sources-to-workspace,
+  prebuild/debian/run-project-hooks,
+  prebuild/debian/load-project-db,
+
+# Configuration de l’étape de compilation du document
+[build]
+hooks=build/latex-compiler/compile
+
+# Configuration de l’étape de post-compilation du document
+[postbuild]
+hooks=
+  postbuild/debian/run-project-hooks,
+  postbuild/common/done

profiles/pypi-2.7.2.conf

@@ -0,0 +1,28 @@
+# Configuration générale du profil
+[profile]
+# Image Docker par défaut
+default_image=ubuntu:bionic
+
+# Configuration de l'étape de pré-construction du conteneur
+[containerbuild]
+hooks=
+  containerbuild/debian/install-build-essential,
+  containerbuild/ubuntu/install-stdeb,
+
+# Configuration de l'étape de pré-construction du paquet
+[prebuild]
+hooks=
+  prebuild/debian/copy-sources-to-workspace,
+  prebuild/debian/run-project-hooks,
+  prebuild/debian/load-project-db,
+
+# Configuration de l'étape de construction du paquet
+[build]
+hooks=build/stdeb/build
+
+# Configuration de l'étape de post-construction du paquet
+[postbuild]
+hooks=
+  postbuild/debian/run-project-hooks,
+  postbuild/debian/export-dist
+

profiles/texlive.conf

@@ -0,0 +1,28 @@
+# Configuration générale du profil
+[profile]
+# Image Docker par défaut
+default_image=ubuntu:focal
+
+# Configuration de l’étape de pré-construction du conteneur
+[containerbuild]
+hooks=
+  containerbuild/texlive/add-packages,
+  containerbuild/texlive/add-ressources,
+
+# Configuration de l’étape de pré-compilation des documents
+[prebuild]
+hooks=
+  prebuild/debian/copy-sources-to-workspace,
+  prebuild/debian/run-project-hooks,
+  prebuild/debian/load-project-db,
+  prebuild/texlive/complete-project-db,
+
+# Configuration de l’étape de compilation du document
+[build]
+hooks=build/texlive/xelatex
+
+# Configuration de l’étape de post-compilation du document
+[postbuild]
+hooks=
+  postbuild/debian/run-project-hooks,
+  postbuild/texlive/export-dist,