diff --git a/sabayon-createrepo-cleanup b/sabayon-createrepo-cleanup index cd726fa..0a3d8ab 100755 --- a/sabayon-createrepo-cleanup +++ b/sabayon-createrepo-cleanup @@ -25,6 +25,8 @@ docker_volumes=( -v "$entropysrv:/etc/entropy/server.conf" -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" ) +[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub") +[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key") check_docker_requirements @@ -46,6 +48,9 @@ else echo "ouch no repository there" && exit 3; fi +[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \ +eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; } + eit clean --quick || { echo "ouch unable to remove" && exit 3; } eit vacuum --quick || { echo "ouch unable to remove" && exit 3; } diff --git a/sabayon-createrepo-remove b/sabayon-createrepo-remove index 980ca66..8ff01cb 100755 --- a/sabayon-createrepo-remove +++ b/sabayon-createrepo-remove @@ -24,7 +24,8 @@ docker_volumes=( -v "$createrepo:/sabayon/bin/create_repo.sh" -v "$entropysrv:/etc/entropy/server.conf" -v "$PORTAGE_ARTIFACTS:/usr/portage/packages" ) - +[ -z "$PUBKEY" ] || docker_volumes+=(-v "$PUBKEY:/etc/entropy/mykeys/key.pub") +[ -z "$PRIVATEKEY" ] || docker_volumes+=(-v "$PRIVATEKEY:/etc/entropy/mykeys/private.key") check_docker_requirements @@ -46,6 +47,9 @@ else echo "ouch no repository there" && exit 3; fi +[ -f "/etc/entropy/mykeys/key.pub" ] && [ -f "/etc/entropy/mykeys/private.key" ] && { ! eit key status \$repo; } && \ +eit key import \$repo /etc/entropy/mykeys/private.key /etc/entropy/mykeys/key.pub && { eit key sign \$repo || true; } && { echo "=== Repository key imported successfully ==="; } + echo "Yes" | eit rm --from \$repo ${args[@]} || { echo "ouch unable to remove" && exit 3; } echo "Yes Yes Yes" | eit commit --quick eit push --quick --force