Profil pour contruire un paquet deb à partir d’une source obtenue sur pypi

hooks/build/stdeb/build

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+cd src
+for archive in *.tar.gz
+do
+    py2dsc $archive
+    folder="$(find deb_dist/* -maxdepth 0 -type d)"
+    pushd $folder
+    dpkg-buildpackage -b -a"${TAMARIN_TARGET_ARCH}"
+    find ../ -maxdepth 1 -name "*.deb" -type f -print0 | xargs -0r mv -t /dist/
+    popd
+    rm -rf $folder
+done
+
+exit 0   

hooks/build/texlive/xelatex

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

hooks/containerbuild/debian/install-letsencrypt-ca

@@ -16,11 +16,11 @@ EOF
 
 
 echo "ENV DEBIAN_FRONTEND=noninteractive" >> Dockerfile
-echo "RUN apt-get update && apt-get install --yes --no-install-recommends wget openssl ca-certificates" >> Dockerfile
+echo "RUN apt-get update && apt-get install --yes --no-install-recommends openssl ca-certificates" >> Dockerfile
 
 for cert in $CERTS; do
     filename=$(basename "$cert")
-    echo "RUN wget -O '$DESTDIR/$filename' $cert" >> Dockerfile
+    echo "ADD $cert $DESTDIR/$filename" >> Dockerfile
     echo "RUN openssl x509 -in '$DESTDIR/$filename' -inform PEM -out '$DESTDIR/$filename.crt'" >> Dockerfile
 done
 

hooks/containerbuild/texlive/add-packages

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

hooks/containerbuild/texlive/add-ressources

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

hooks/containerbuild/ubuntu/install-stdeb

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo 'ENV DEBIAN_FRONTEND=noninteractive' >> Dockerfile
+echo 'RUN apt-get update && apt-get install --yes --no-install-recommends python3-all dh-python python3-pip' >> Dockerfile
+echo 'RUN pip3 install stdeb' >> Dockerfile
+echo 'ENV DEBIAN_FRONTEND=' >> Dockerfile
+

hooks/postbuild/texlive/export-dist

@@ -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 :-)"

hooks/prebuild/eole/create-changelog

@@ -181,7 +181,6 @@ function packager_from_commit {
 }
 
 function next_version {
-  set -x
   commit="$1"
   # upstream version is given by most recent of release or pkg tag
   previous_pkg="$(git describe --long --match='pkg/*' $commit 2>/dev/null)"
@@ -205,7 +204,6 @@ function next_version {
     version="$(get_upstream_version_from_tag $previous_release)-1"
   elif [ -n "$previous_pkg" ]
   then
-    distance_from_pkg=$(get_distance_from_tag "$previous_pkg" "$commit")
     distance=$distance_from_pkg
     version="$(get_upstream_version_from_tag $previous_pkg)-$(expr $(get_package_version_from_tag $previous_pkg) + 1)"
   else
@@ -214,10 +212,9 @@ function next_version {
   fi
   if [ "$package_level" = 'dev' ] || [ "$package_level" = 'staging' ]
   then
-    version="${version}~${package_level}+${distance}"
+    version="${version}~${package_level}+${distance}~$(get_short_hash $commit)"
   fi
   echo $version
-  set +x
 }
 
 function gen_changelog_entry {
@@ -260,15 +257,9 @@ function gen_changelog_entry {
 }
 
 function gen_changelog() {
-  limit=10
   while gen_changelog_entry $ceiling_commit
   do
-    limit=`expr $limit - 1`
     echo $changelog_entry
-    if [ "$limit" -le 0 ]
-    then
-      break
-    fi
   done
 }
 

hooks/prebuild/texlive/complete-project-db

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-cd src

lib/tamarin.py

@@ -55,10 +55,6 @@ 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

@@ -84,7 +84,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,17 +108,16 @@ if __name__ == "__main__":
 
         # volumes definition
         docker_args += [
-            "-v", "{:s}:/src:z,ro".format(project_dir),
+            "-v", "{:s}:/src:ro".format(project_dir),
-            "-v", "{:s}:/dist:z".format(output_dir),
+            "-v", "{:s}:/dist".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:z,ro".format(tamarin.get_hooks_dir()),
+                "-v", "{:s}:/tamarin/hooks:ro".format(tamarin.get_hooks_dir()),
-                "-v", "{:s}:/tamarin/lib:z,ro".format(tamarin.get_lib_dir()),
+                "-v", "{:s}:/tamarin/lib:ro".format(tamarin.get_lib_dir()),
-                "-v", "{:s}:/tamarin/profiles:z,ro".format(tamarin.get_profiles_dir()),
+                "-v", "{:s}:/tamarin/profiles:ro".format(tamarin.get_profiles_dir()),
-                "-v", "{:s}:/tamarin/utils:z,ro".format(tamarin.get_utils_dir())
+                "-v", "{:s}:/tamarin/utils:ro".format(tamarin.get_utils_dir())
             ]
 
         # Use environment proxy if defined

profiles/eole-2.7.0.conf

@@ -1,30 +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/debian/install-git,
-
-# 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,
-  prebuild/debian/complete-project-db,
-  prebuild/eole/create-changelog,
-  prebuild/debian/install-build-depends
-
-# Configuration de l'étape de construction du paquet
-[build]
-hooks=build/debian/build
-
-# Configuration de l'étape de post-construction du paquet
-[postbuild]
-hooks=
-  postbuild/debian/run-project-hooks,
-  postbuild/debian/export-dist

profiles/eole-2.7.1.conf

@@ -17,6 +17,7 @@ hooks=
   prebuild/debian/load-project-db,
   prebuild/debian/complete-project-db,
   prebuild/eole/create-changelog,
+  prebuild/eole/add-package-version-suffix,
   prebuild/debian/install-build-depends
 
 # Configuration de l'étape de construction du paquet

profiles/pypi-2.8.1.conf

@@ -7,7 +7,7 @@ default_image=ubuntu:focal
 [containerbuild]
 hooks=
   containerbuild/debian/install-build-essential,
-  containerbuild/debian/install-git,
+  containerbuild/ubuntu/install-stdeb,
 
 # Configuration de l'étape de pré-construction du paquet
 [prebuild]
@@ -15,16 +15,14 @@ hooks=
   prebuild/debian/copy-sources-to-workspace,
   prebuild/debian/run-project-hooks,
   prebuild/debian/load-project-db,
-  prebuild/debian/complete-project-db,
-  prebuild/eole/create-changelog,
-  prebuild/debian/install-build-depends
 
 # Configuration de l'étape de construction du paquet
 [build]
-hooks=build/debian/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

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