Compare commits
5 Commits
feature/do
...
develop
Author | SHA1 | Date |
---|---|---|
wpetit | 9e9fdee0d6 | |
wpetit | 8db349571a | |
wpetit | 68ca0365ae | |
Benjamin Bohard | 6fe1d305e0 | |
Benjamin Bohard | fdebf244d5 |
|
@ -63,10 +63,10 @@ function parse_tag {
|
||||||
extended_version="${tag##*/}"
|
extended_version="${tag##*/}"
|
||||||
if [ "$flavor" = "pkg" ]
|
if [ "$flavor" = "pkg" ]
|
||||||
then
|
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" ]
|
elif [ "$flavor" = "release" ]
|
||||||
then
|
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
|
fi
|
||||||
echo $exploded_version
|
echo $exploded_version
|
||||||
}
|
}
|
||||||
|
|
2
package
2
package
|
@ -41,7 +41,7 @@ def build_image(build_workspace, base_image, profile_name, profile, debug=False,
|
||||||
# Run hooks
|
# 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, env=hooks_env, debug=debug)
|
||||||
|
|
||||||
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_'), os.getpid())
|
image_tag = "tamarin:{:s}_{:s}_{:d}".format(profile_name, base_image.replace(':', '_').replace('/', '_'), os.getpid())
|
||||||
|
|
||||||
build_args = [ "build", "-t", image_tag ]
|
build_args = [ "build", "-t", image_tag ]
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Configuration générale du profil
|
# Configuration générale du profil
|
||||||
[profile]
|
[profile]
|
||||||
# Image Docker par défaut
|
# Image Docker par défaut
|
||||||
default_image=debian:stretch
|
default_image=reg.cadoles.com/proxy_cache/library/debian:bookworm
|
||||||
|
|
||||||
# Configuration de l'étape de pré-construction du conteneur
|
# Configuration de l'étape de pré-construction du conteneur
|
||||||
[containerbuild]
|
[containerbuild]
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
# 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/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]
|
||||||
|
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
|
Loading…
Reference in New Issue