diff --git a/Makefile b/Makefile index 4d91c75..a229a1c 100644 --- a/Makefile +++ b/Makefile @@ -2,19 +2,28 @@ include Makefile.variable print-%: ; @echo $*=$($*) -all: target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz target/docker-$(DOCKER_VERSION)-centos7.tar.gz target/docker-$(DOCKER_VERSION)-all.tar.gz +all: target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz target/docker-$(DOCKER_VERSION)-all.tar.gz -github-release: ubuntu1404-github ubuntu1204-github centos7-github total-github +ubuntu: target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz + +centos: target/docker-$(DOCKER_VERSION)-centos7.2.tar.gz target/docker-$(DOCKER_VERSION)-centos7.1.tar.gz + +github-release: ubuntu1404-github ubuntu1204-github target/ubuntu14.04: echo 'building ubuntu 14.04' mkdir -p target/ubuntu14.04 bash ubuntu/build.sh $(DOCKER_VERSION) 14.04 target/ubuntu14.04 -target/centos7: - echo 'building centos7' - mkdir -p target/centos7 - bash centos/build.sh $(DOCKER_VERSION) 7 target/centos7 +target/centos7.2: + echo 'building centos7.2' + mkdir -p target/centos7.2 + bash centos/build.sh $(DOCKER_VERSION) 7.2.1511 target/centos7.2 + +target/centos7.1: + echo 'building centos7.1' + mkdir -p target/centos7.1 + bash centos/build.sh $(DOCKER_VERSION) 7.1.1503 target/centos7.1 target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz: target/ubuntu14.04 rm -rf target/docker-$(DOCKER_VERSION)-ubuntu14.04 @@ -23,18 +32,30 @@ target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz: target/ubuntu14.04 cp install.sh target/docker-$(DOCKER_VERSION)-ubuntu14.04 tar -zcvf target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz -C target docker-$(DOCKER_VERSION)-ubuntu14.04 -target/docker-$(DOCKER_VERSION)-centos7.tar.gz: target/centos7 - rm -rf target/docker-$(DOCKER_VERSION)-centos7 - mkdir -p target/docker-$(DOCKER_VERSION)-centos7 - cp -r target/centos7 target/docker-$(DOCKER_VERSION)-centos7 - cp install.sh target/docker-$(DOCKER_VERSION)-centos7 - tar -zcvf target/docker-$(DOCKER_VERSION)-centos7.tar.gz -C target docker-$(DOCKER_VERSION)-centos7 +target/docker-$(DOCKER_VERSION)-centos7.2.tar.gz: target/centos7.2 + rm -rf target/docker-$(DOCKER_VERSION)-centos7.2 + mkdir -p target/docker-$(DOCKER_VERSION)-centos7.2 + cp -r target/centos7.2 target/docker-$(DOCKER_VERSION)-centos7.2 + cp install.sh target/docker-$(DOCKER_VERSION)-centos7.2 + tar -zcvf target/docker-$(DOCKER_VERSION)-centos7.2.tar.gz -C target docker-$(DOCKER_VERSION)-centos7.2 + +target/docker-$(DOCKER_VERSION)-centos7.1.tar.gz: target/centos7.1 + rm -rf target/docker-$(DOCKER_VERSION)-centos7.1 + mkdir -p target/docker-$(DOCKER_VERSION)-centos7.1 + cp -r target/centos7.1 target/docker-$(DOCKER_VERSION)-centos7.1 + cp install.sh target/docker-$(DOCKER_VERSION)-centos7.1 + tar -zcvf target/docker-$(DOCKER_VERSION)-centos7.1.tar.gz -C target docker-$(DOCKER_VERSION)-centos7.1 + ubuntu1404-github: target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz github-tag - github-release upload -u xamoc -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz -f target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz 2>/dev/null; true + github-release upload -u DaoCloud -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz -f target/docker-$(DOCKER_VERSION)-ubuntu14.04.tar.gz 2>/dev/null; true + +centos72-github: target/docker-$(DOCKER_VERSION)-centos7.2.tar.gz github-tag + github-release upload -u DaoCloud -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-centos7.2.tar.gz -f target/docker-$(DOCKER_VERSION)-centos7.2.tar.gz 2>/dev/null; true + +centos71-github: target/docker-$(DOCKER_VERSION)-centos7.1.tar.gz github-tag + github-release upload -u DaoCloud -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-centos7.1.tar.gz -f target/docker-$(DOCKER_VERSION)-centos7.1.tar.gz 2>/dev/null; true -centos7-github: target/docker-$(DOCKER_VERSION)-centos7.tar.gz github-tag - github-release upload -u xamoc -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-centos7.tar.gz -f target/docker-$(DOCKER_VERSION)-centos7.tar.gz 2>/dev/null; true target/ubuntu12.04: echo 'building ubuntu 12.04' @@ -51,19 +72,20 @@ target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz: target/ubuntu12.04 ubuntu1204-github: target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz github-tag github-release upload -u xamoc -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz -f target/docker-$(DOCKER_VERSION)-ubuntu12.04.tar.gz 2>/dev/null; true -target/docker-$(DOCKER_VERSION)-all.tar.gz: target/ubuntu14.04 target/centos7 +target/docker-$(DOCKER_VERSION)-all.tar.gz: target/ubuntu14.04 target/centos7.2 target/centos7.1 rm -rf target/docker-$(DOCKER_VERSION)-all mkdir -p target/docker-$(DOCKER_VERSION)-all cp -r target/ubuntu14.04 target/docker-$(DOCKER_VERSION)-all - cp -r target/centos7 target/docker-$(DOCKER_VERSION)-all + cp -r target/centos7.2 target/docker-$(DOCKER_VERSION)-all + cp -r target/centos7.1 target/docker-$(DOCKER_VERSION)-all cp install.sh target/docker-$(DOCKER_VERSION)-all tar -zcvf target/docker-$(DOCKER_VERSION)-all.tar.gz -C target docker-$(DOCKER_VERSION)-all total-github: target/docker-$(DOCKER_VERSION)-all.tar.gz github-tag - github-release upload -u xamoc -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-all.tar.gz -f target/docker-$(DOCKER_VERSION)-all.tar.gz 2>/dev/null; true + github-release upload -u DaoCloud -r docker-offline -t $(DOCKER_VERSION) -n docker-$(DOCKER_VERSION)-all.tar.gz -f target/docker-$(DOCKER_VERSION)-all.tar.gz 2>/dev/null; true github-tag: - github-release release -u xamoc -r docker-offline -t $(DOCKER_VERSION) 2>/dev/null; true + github-release release -u DaoCloud -r docker-offline -t $(DOCKER_VERSION) 2>/dev/null; true clean: diff --git a/VERSION b/VERSION index 5ad2491..1cac385 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.2 +1.11.0 diff --git a/centos/build-inner b/centos/build-inner index 4806d96..8ecbd35 100755 --- a/centos/build-inner +++ b/centos/build-inner @@ -3,7 +3,7 @@ cat >/etc/yum.repos.d/docker-main.repo <<-EOF [docker-main-repo] name=Docker main Repository -baseurl=https://get.daocloud.io/docker/yum-repo/main/centos/$2 +baseurl=https://get.daocloud.io/docker/yum-repo/main/centos/7 enabled=1 gpgcheck=1 gpgkey=https://get.daocloud.io/docker/yum/gpg @@ -17,11 +17,13 @@ else fi NAME=$NAME-$2 +yum erase -y fakesystemd* libsemanage* + for v in $all_versions; do echo "Pulling version $v..." yum install docker-engine-$v --downloadonly --downloaddir=/data/$NAME-$v - yum reinstall libsemanage --downloadonly --downloaddir=/data/$NAME-$v + #yum reinstall libsemanage --downloadonly --downloaddir=/data/$NAME-$v #tar zcf /data/$NAME-$v.tar -C /data $NAME-$v done -#find /data -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \; \ No newline at end of file +#find /data -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \; diff --git a/install.sh b/install.sh index fe1fc4a..16d317d 100755 --- a/install.sh +++ b/install.sh @@ -82,7 +82,7 @@ case "$lsb_dist" in exit 0 ;; - centos) + centos|rhel) ( echo " * Installing Docker..." dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" @@ -91,9 +91,8 @@ case "$lsb_dist" in ) exit 0 ;; - esac $sh_c 'curl -sSL https://get.daocloud.io/docker/ | sh' exit 0 -;; \ No newline at end of file +;; diff --git a/ubuntu/build.sh b/ubuntu/build.sh index 0ffba19..9ccc6da 100644 --- a/ubuntu/build.sh +++ b/ubuntu/build.sh @@ -18,7 +18,8 @@ docker cp ubuntu/build-inner "$NAME":/usr/bin/build-inner docker start -a $NAME -rm -rf /tmp/$NAME +mkdir -p /tmp/$NAME docker cp "$NAME":/var/cache/apt/archives/ /tmp/$NAME cp /tmp/$NAME/*.deb $3 +rm -rf /tmp/$NAME