clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to use a different GPG key identifier

Browse Source 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
This commit is contained in:
Mike Dougherty
2015-08-31 11:27:57 -07:00
parent b46c15e772
commit 7ca017eb62
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hack/make/release-deb
+2 -1
View File
@@ -15,6 +15,7 @@ set -e
# ... and so on and so forth for the builds created by hack/make/build-deb
: ${DOCKER_RELEASE_DIR:=$DEST}
: ${GPG_KEYID:=releasedocker}
APTDIR=$DOCKER_RELEASE_DIR/apt/repo
# setup the apt repo (if it does not exist)
@@ -63,7 +64,7 @@ for dir in contrib/builder/deb/*/; do
# dpkg-sign before reprepro
if [ ! -z "$GPG_PASSPHRASE" ]; then
dpkg-sig -g "--passphrase $GPG_PASSPHRASE" \
-k releasedocker --sign builder "${DEBFILE[@]}"
-k "$GPG_KEYID" --sign builder "${DEBFILE[@]}"
fi
reprepro -v $options \
hack/make/release-rpm
+6 -5
View File
@@ -16,6 +16,7 @@ set -e
: ${DOCKER_RELEASE_DIR:=$DEST}
YUMDIR=$DOCKER_RELEASE_DIR/yum/repo
: ${GPG_KEYID:=releasedocker}
# manage the repos for each distribution separately
distros=( fedora centos oraclelinux )
@@ -53,15 +54,15 @@ for distro in "${distros[@]}"; do
# sign the rpms before adding to repo
if [ ! -z $GPG_PASSPHRASE ]; then
# export our key to rpm import
gpg --armor --export releasedocker > /tmp/gpg
gpg --armor --export "$GPG_KEYID" > /tmp/gpg
rpm --import /tmp/gpg
# sign the rpms
echo "yes" | setsid rpm \
--define '_gpg_name releasedocker' \
--define '_signature gpg' \
--define '__gpg_check_password_cmd /bin/true' \
--define '__gpg_sign_cmd %{__gpg} gpg --batch --no-armor --passphrase '$GPG_PASSPHRASE' --no-secmem-warning -u "%{_gpg_name}" --sign --detach-sign --output %{__signature_filename} %{__plaintext_filename}' \
--define "_gpg_name $GPG_KEYID" \
--define "_signature gpg" \
--define "__gpg_check_password_cmd /bin/true" \
--define "__gpg_sign_cmd %{__gpg} gpg --batch --no-armor --passphrase '$GPG_PASSPHRASE' --no-secmem-warning -u '%{_gpg_name}' --sign --detach-sign --output %{__signature_filename} %{__plaintext_filename}" \
--resign "${RPMFILE[@]}"
fi
hack/make/sign-repos
+5 -4
View File
@@ -4,6 +4,7 @@
# with a designated GPG key.
: ${DOCKER_RELEASE_DIR:=$DEST}
: ${GPG_KEYID:=releasedocker}
APTDIR=$DOCKER_RELEASE_DIR/apt/repo
YUMDIR=$DOCKER_RELEASE_DIR/yum/repo
@@ -21,12 +22,12 @@ sign_packages(){
# sign apt repo metadata
if [ -d $APTDIR ]; then
# create file with public key
gpg --armor --export releasedocker > "$DOCKER_RELEASE_DIR/apt/gpg"
gpg --armor --export "$GPG_KEYID" > "$DOCKER_RELEASE_DIR/apt/gpg"
# sign the repo metadata
for F in $(find $APTDIR -name Release); do
if test "$F" -nt "$F.gpg" ; then
gpg -u releasedocker --passphrase "$GPG_PASSPHRASE" \
gpg -u "$GPG_KEYID" --passphrase "$GPG_PASSPHRASE" \
--armor --sign --detach-sign \
--batch --yes \
--output "$F.gpg" "$F"
@@ -37,12 +38,12 @@ sign_packages(){
# sign yum repo metadata
if [ -d $YUMDIR ]; then
# create file with public key
gpg --armor --export releasedocker > "$DOCKER_RELEASE_DIR/yum/gpg"
gpg --armor --export "$GPG_KEYID" > "$DOCKER_RELEASE_DIR/yum/gpg"
# sign the repo metadata
for F in $(find $YUMDIR -name repomd.xml); do
if test "$F" -nt "$F.asc" ; then
gpg -u releasedocker --passphrase "$GPG_PASSPHRASE" \
gpg -u "$GPG_KEYID" --passphrase "$GPG_PASSPHRASE" \
--armor --sign --detach-sign \
--batch --yes \
--output "$F.asc" "$F"