Browse code

use correct apt-key for test.docker.io/ubuntu

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Jessica Frazelle authored on 2014/09/12 05:49:43
Showing 1 changed files
... ...
@@ -274,6 +274,11 @@ EOF
274 274
 	gpg --armor --export releasedocker > bundles/$VERSION/ubuntu/gpg
275 275
 	s3cmd --acl-public put bundles/$VERSION/ubuntu/gpg s3://$BUCKET/gpg
276 276
 
277
+	local gpgFingerprint=36A1D7869245C8950F966E92D8576A8BA88D21E9
278
+	if [[ $BUCKET == test* ]]; then
279
+		gpgFingerprint=740B314AE3941731B942C66ADF4FD13717AAD7D6
280
+	fi
281
+
277 282
 	# Upload repo
278 283
 	s3cmd --acl-public sync $APTDIR/ s3://$BUCKET/ubuntu/
279 284
 	cat <<EOF | write_to_s3 s3://$BUCKET/ubuntu/index
... ...
@@ -287,7 +292,7 @@ fi
287 287
 echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
288 288
 
289 289
 # Then import the repository key
290
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
290
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $gpgFingerprint
291 291
 
292 292
 # Install docker
293 293
 apt-get update