diff --git a/hooks/build/texlive/xelatex b/hooks/build/texlive/xelatex index dad11d5..b12e098 100755 --- a/hooks/build/texlive/xelatex +++ b/hooks/build/texlive/xelatex @@ -1,4 +1,4 @@ #!/usr/bin/env bash cd src -make +make presentations/modules_EOLE_envole/support.pdf diff --git a/hooks/containerbuild/texlive/add-packages b/hooks/containerbuild/texlive/add-packages index c979923..7dd7cbd 100755 --- a/hooks/containerbuild/texlive/add-packages +++ b/hooks/containerbuild/texlive/add-packages @@ -5,4 +5,6 @@ set -e echo 'ENV DEBIAN_FRONTEND=noninteractive' >> Dockerfile echo 'RUN apt-get update && apt-get install --yes --no-install-recommends texlive-full' >> Dockerfile echo 'RUN apt-get update && apt-get install --yes --no-install-recommends make' >> Dockerfile +echo 'RUN apt-get update && apt-get install --yes --no-install-recommends fonts-liberation fonts-liberation2' >> Dockerfile +echo 'RUN apt-get update && apt-get install --yes --no-install-recommends python3-pygments' >> Dockerfile echo 'ENV DEBIAN_FRONTEND=' >> Dockerfile diff --git a/hooks/postbuild/texlive/export-dist b/hooks/postbuild/texlive/export-dist index d898a3f..1f1b2ce 100755 --- a/hooks/postbuild/texlive/export-dist +++ b/hooks/postbuild/texlive/export-dist @@ -1,7 +1,7 @@ #!/bin/bash function move_output_to_dist { - find . -maxdepth 1 -name "$1" -type f -print0 | xargs -0r mv -t /dist/ + find . -name "$1" -type f -print0 | xargs -0r mv -t /dist/ } # Create new directory diff --git a/lib/tamarin.py b/lib/tamarin.py index a19a689..6adca05 100644 --- a/lib/tamarin.py +++ b/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: diff --git a/package b/package index a83e7c7..db7e445 100755 --- a/package +++ b/package @@ -86,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) @@ -112,6 +112,7 @@ if __name__ == "__main__": docker_args += [ "-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: