Merge pull request #7 from nghiant2710/master

Change the way how image built. No longer bind mount docker.sock sock…

Author: nghiant2710

Dockerfile

@@ -1,11 +1,8 @@
 FROM debian:jessie
 
-RUN echo "deb http://http.debian.net/debian jessie-backports main"  >> /etc/apt/sources.list
-
 RUN apt-get -q update \
 	&& apt-get -qy install \
 		curl \
-		docker.io \
 		debootstrap \
 		python \
 		python-pip \

automation/build-image.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+
+MIRROR='http://ftp.uk.debian.org/debian/'
+
+docker build -t amd64-debian-mkimage .
+
+for suite in $SUITES; do
+
+	rm -rf output
+	mkdir -p output
+	docker run --rm --privileged	-e REPO=$REPO \
+									-e SUITE=$suite \
+									-e MIRROR=$MIRROR \
+									-v `pwd`/output:/output amd64-debian-mkimage
+
+	docker build -t $REPO:$suite output/
+done

automation/jenkins-build.sh

@@ -1,6 +1,37 @@
 #!/bin/bash
 
-# Jenkins build steps
-docker build -t amd64-debian-mkimage .
-docker run --privileged -e REGION_NAME=$REGION_NAME -e ACCESS_KEY=$ACCESS_KEY -e SECRET_KEY=$SECRET_KEY -e BUCKET_NAME=$BUCKET_NAME -v /var/run/docker.sock:/var/run/docker.sock amd64-debian-mkimage
-docker push resin/amd64-debian
+set -o errexit
+set -o pipefail
+
+export SUITES='wheezy jessie'
+export REPO='resin/amd64-debian'
+LATEST='jessie'
+dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+date=$(date +'%Y%m%d' -u)
+
+bash "$dir/build-image.sh"
+for suite in $SUITES; do
+	
+	docker run --rm $REPO:$suite bash -c 'dpkg-query -l' > $suite
+
+	# Upload to S3 (using AWS CLI)
+	printf "$ACCESS_KEY\n$SECRET_KEY\n$REGION_NAME\n\n" | aws configure
+	aws s3 cp $suite s3://$BUCKET_NAME/image_info/amd64-debian/$suite/
+	aws s3 cp $suite s3://$BUCKET_NAME/image_info/amd64-debian/$suite/$suite_$date
+	rm -f $suite 
+
+	docker tag -f $REPO:$suite $REPO:$suite-$date
+	if [ $LATEST == $suite ]; then
+		docker tag -f $REPO:$suite $REPO:latest
+	fi
+done
+
+docker push $REPO
+
+# Clean up unnecessary docker images after pushing
+if [ $? -eq 0 ]; then
+	for suite in $SUITES; do
+		docker rmi -f $REPO:$suite
+		docker rmi -f $REPO:$suite-$date
+	done
+fi

build.sh

@@ -2,28 +2,6 @@
 
 set -o errexit
 
-SUITES='wheezy jessie'
-MIRROR='http://ftp.uk.debian.org/debian/'
-REPO='resin/amd64-debian'
-LATEST='jessie'
+dir=$(mktemp --tmpdir=/var/tmp -d)
 
-for suite in $SUITES; do
-	dir=$(mktemp --tmpdir=/var/tmp -d)
-	date=$(date +'%Y%m%d' -u)
-	
-	./mkimage.sh -t $REPO:$suite --dir=$dir debootstrap --variant=minbase --arch=amd64 --include=sudo $suite $MIRROR
-	rm -rf $dir
-
-	docker run --rm $REPO:$suite bash -c 'dpkg-query -l' > $suite
-	
-	# Upload to S3 (using AWS CLI)
-	printf "$ACCESS_KEY\n$SECRET_KEY\n$REGION_NAME\n\n" | aws configure
-	aws s3 cp $suite s3://$BUCKET_NAME/image_info/amd64-debian/$suite/
-	aws s3 cp $suite s3://$BUCKET_NAME/image_info/amd64-debian/$suite/$suite_$date
-	rm -f $suite
-	
-	docker tag -f $REPO:$suite $REPO:$suite-$date
-	if [ $LATEST == $suite ]; then
-		docker tag -f $REPO:$suite $REPO:latest
-	fi
-done
+./mkimage.sh -t $REPO:$SUITE --dir=$dir debootstrap --variant=minbase --arch=amd64 --include=sudo $SUITE $MIRROR

mkimage.sh

@@ -110,13 +110,4 @@ done
 
 ( set -x; rm -rf "$rootfsDir" )
 
-if [ "$tag" ]; then
-	( set -x; docker build -t "$tag" "$dir" )
-elif [ "$delDir" ]; then
-	# if we didn't specify a tag and we're going to delete our dir, let's just build an untagged image so that we did _something_
-	( set -x; docker build "$dir" )
-fi
-
-if [ "$delDir" ]; then
-	( set -x; rm -rf "$dir" )
-fi
+cp "$dir"/* /output/