4 Commits

28 changed files with 54 additions and 328 deletions

Binary file not shown.

Binary file not shown.

View File

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

View File

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

View File

@ -1,12 +0,0 @@
#!/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

View File

@ -1,8 +0,0 @@
#!/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

View File

@ -1,12 +0,0 @@
#!/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

View File

@ -1,13 +0,0 @@
#!/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

View File

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

View File

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

View File

@ -1,23 +0,0 @@
#!/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

View File

@ -1,8 +0,0 @@
#!/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

View File

@ -1,13 +0,0 @@
#!/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

View File

@ -1,11 +0,0 @@
#!/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

View File

@ -1,14 +0,0 @@
#!/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

View File

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

View File

@ -1,14 +0,0 @@
#!/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 :-)"

View File

@ -1,13 +0,0 @@
#!/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 :-)"

View File

@ -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
}

View File

@ -1,4 +1,4 @@
import os, glob, subprocess, configparser, codecs, sys
import os, glob, subprocess, configparser, codecs, sys, pathlib
def run_profile_hooks(profile, step, **kwargs):
hooks_dir = get_hooks_dir()
@ -9,55 +9,57 @@ def run_profile_hooks(profile, step, **kwargs):
trimmed_hook_name = hook_name.strip(' \t\n\r')
if not trimmed_hook_name:
continue
hook_path = os.path.join(hooks_dir, trimmed_hook_name)
hook_path = hooks_dir.joinpath(trimmed_hook_name)
run([hook_path], **kwargs)
def get_base_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/..")
base_dir = pathlib.Path(__file__).absolute().parent.parent.resolve()
return base_dir
def get_hooks_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../hooks")
hooks_dir = get_base_dir().joinpath('hooks')
return hooks_dir
def get_lib_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../lib")
lib_dir = get_base_dir().joinpath('lib')
return lib_dir
def get_utils_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../utils")
def load_profile(profile_name, debug=False):
profile_filename = profile_name+".conf"
for profile_file in get_available_profiles():
if profile_filename == os.path.basename(profile_file):
config = configparser.ConfigParser()
with codecs.open(profile_file, encoding = 'utf-8', mode = 'r') as handle:
config.read_file(handle)
return config
return None
utils_dir = get_base_dir().joinpath('utils')
return utils_dir
def get_profiles_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../profiles")
def get_available_profiles():
return glob.glob(get_profiles_dir() + '/*.conf')
def get_available_profile_names():
profile_files = get_available_profiles()
return [os.path.splitext(os.path.basename(f))[0] for f in profile_files]
profiles_dir = get_base_dir().joinpath('profiles')
return profiles_dir
def get_workspace_dir():
"""Return the absolute path to the tamarin workspace ($HOME/.tamarin)"""
home = os.environ["HOME"]
return os.path.join(os.sep, home, '.tamarin')
home = pathlib.Path(os.environ["HOME"])
workspace_dir = home.joinpath('.tamarin')
return workspace_dir
def get_workspace_subdir(subdir):
"""Return the absolute path to a subdirectory in tamarin workspace"""
dir_path = os.path.join(os.sep, get_workspace_dir(), subdir)
os.makedirs(dir_path, exist_ok=True)
return dir_path
subdir_path = get_workspace_dir().joinpath(subdir)
subdir_path.mkdir(parents=True, exist_ok=True)
return subdir_path
def get_datasets_dir():
return os.path.realpath(os.path.dirname(os.path.abspath(__file__)) + "/../datasets")
def load_profile(profile_name, debug=False):
profile_filename = profile_name+".conf"
profile_path = get_profiles_dir().joinpath(profile_filename)
if profile_path.exists():
config = configparser.ConfigParser()
with codecs.open(profile_path, encoding = 'utf-8', mode = 'r') as handle:
config.read_file(handle)
return config
return None
def get_available_profiles():
return get_profiles_dir().glob('*.conf')
def get_available_profile_names():
profile_files = get_available_profiles()
return [p.stem for p in profile_files]
def run(cmd, captureOutput=False, pty=False, debug=False, **kwargs):
"""Execute an arbitrary command on the system"""

38
package
View File

@ -1,8 +1,8 @@
#!/usr/bin/env python3
import argparse, sys, shutil, os, subprocess
import argparse, sys, shutil, os, subprocess, pathlib
sys.path.append(os.path.dirname(__file__) + '/lib')
sys.path.append(pathlib.Path(__file__).parent.joinpath('lib').as_posix())
import tamarin
@ -28,20 +28,20 @@ def create_args_parser():
return parser
def build_image(build_workspace, base_image, profile_name, profile, debug=False, rebuild=False):
shutil.copytree(tamarin.get_base_dir(), os.path.join(build_workspace, '.tamarin'))
shutil.copytree(tamarin.get_base_dir(), build_workspace.joinpath('.tamarin'))
with open("{:s}/Dockerfile".format(build_workspace), 'w') as dockerfile:
with open(build_workspace.joinpath("Dockerfile"), 'w') as dockerfile:
dockerfile.write("FROM {:s}\n".format(base_image))
dockerfile.write("COPY .tamarin /tamarin\n")
# Configure "containerbuild" hooks environment
hooks_env = os.environ.copy()
hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir()
hooks_env["PATH"] = os.environ['PATH'] + ':' + tamarin.get_lib_dir().as_posix()
# Run hooks
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=hooks_env, debug=debug)
tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace.as_posix(), env=hooks_env, debug=debug)
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_').replace('/', '_'), os.getpid())
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
build_args = [ "build", "-t", image_tag ]
@ -72,10 +72,9 @@ if __name__ == "__main__":
cleanup(debug=args.debug)
# 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)
project_dir = pathlib.Path(args.project_directory).absolute()
output_dir = pathlib.Path(args.output).absolute()
output_dir.mkdir(parents=True, exist_ok=True)
# Load build profile
profile = tamarin.load_profile(args.profile, debug=args.debug)
@ -85,8 +84,8 @@ if __name__ == "__main__":
pid = os.getpid()
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'))
shutil.copytree(tamarin.get_utils_dir(), build_workspace.joinpath('utils'))
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)
@ -110,17 +109,16 @@ if __name__ == "__main__":
# volumes definition
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()),
"-v", "{:s}:/src:z,ro".format(project_dir.as_posix()),
"-v", "{:s}:/dist:z".format(output_dir.as_posix()),
]
if not args.no_lib_mounts:
docker_args += [
"-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())
"-v", "{:s}:/tamarin/hooks:z,ro".format(tamarin.get_hooks_dir().as_posix()),
"-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir().as_posix()),
"-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir().as_posix()),
"-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir().as_posix())
]
# Use environment proxy if defined

View File

@ -8,6 +8,7 @@ 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]

View File

@ -1,27 +0,0 @@
# 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,

View File

@ -1,28 +0,0 @@
# 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

View File

@ -1,28 +0,0 @@
# 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

View File

@ -1,28 +0,0 @@
# 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,