docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu 

use correct apt-key for test.docker.io/ubuntu
This commit is contained in:
Tianon Gravi 2014-09-17 00:06:57 -06:00
parent b03f506303 440eb7fee8
commit 41e625eb7c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/release.sh
View File

@ -274,6 +274,11 @@ EOF
gpg --armor --export releasedocker > bundles/$VERSION/ubuntu/gpg gpg --armor --export releasedocker > bundles/$VERSION/ubuntu/gpg
s3cmd --acl-public put bundles/$VERSION/ubuntu/gpg s3://$BUCKET/gpg s3cmd --acl-public put bundles/$VERSION/ubuntu/gpg s3://$BUCKET/gpg
local gpgFingerprint=36A1D7869245C8950F966E92D8576A8BA88D21E9
if [[ $BUCKET == test* ]]; then
gpgFingerprint=740B314AE3941731B942C66ADF4FD13717AAD7D6
fi
# Upload repo # Upload repo
s3cmd --acl-public sync $APTDIR/ s3://$BUCKET/ubuntu/ s3cmd --acl-public sync $APTDIR/ s3://$BUCKET/ubuntu/
cat <<EOF | write_to_s3 s3://$BUCKET/ubuntu/index cat <<EOF | write_to_s3 s3://$BUCKET/ubuntu/index
@ -287,7 +292,7 @@ fi
echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
# Then import the repository key # Then import the repository key
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $gpgFingerprint
# Install docker # Install docker
apt-get update apt-get update