diff options
Diffstat (limited to 'build/docker')
| -rw-r--r-- | build/docker/.gitignore | 2 | ||||
| -rw-r--r-- | build/docker/Makefile | 73 | ||||
| -rwxr-xr-x | build/docker/runcontext | 4 |
3 files changed, 72 insertions, 7 deletions
diff --git a/build/docker/.gitignore b/build/docker/.gitignore new file mode 100644 index 000000000..2585910ce --- /dev/null +++ b/build/docker/.gitignore @@ -0,0 +1,2 @@ +.docker* +ubuntu-builder/Dockerfile diff --git a/build/docker/Makefile b/build/docker/Makefile index d4423b0a2..783881e8d 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# Copyright (c) 2015,2016 Ericsson AB and others. # stefan.k.berg@ericsson.com # jonas.bjurel@ericsson.com # All rights reserved. This program and the accompanying materials @@ -12,6 +12,15 @@ SHELL = /bin/bash FILES = $(wildcard ubuntu-builder/*) runcontext DOCKER_VER := $(shell [[ "$$(docker version --format '{{.Client.Version}}')" =~ ([0-9]+)\.([0-9]+) ]] && echo $$(( $${BASH_REMATCH[1]} * 100 + $${BASH_REMATCH[2]} ))) +# Builder tag lifespan, force container rebuild X days after tag creation +DOCKER_KEEP = 1 days +DOCKER_IMG = opnfv.org/ubuntu-builder +DOCKER_TAG = ${DOCKER_IMG}:14.04 +# Shell contruct for checking our tag object did not expire +DOCKER_EXPIRED = D_TAG_BIRTH=`docker inspect --format="{{.Created}}" \ + ${DOCKER_TAG} 2>/dev/null`; test -z "$$D_TAG_BIRTH" -o `date +%s` -gt \ + `date -d "$$D_TAG_BIRTH +${DOCKER_KEEP}" +%s`; echo $$? + # Don't use -f flag when docker is newer than 1.9 # https://docs.docker.com/engine/deprecated/#/f-flag-on-docker-tag ifeq ($(shell echo "$(DOCKER_VER)>109" | bc), 1) @@ -23,7 +32,7 @@ endif .PHONY: all all: .docker -.docker: $(FILES) +.dockercfg: $(FILES) cp Dockerfile ubuntu-builder/Dockerfile # Only add proxy ENVs where set in host - needed to pull the base Ubuntu image test -n "${http_proxy}" && sed -i "s;INSERT_HTTP_PROXY;${http_proxy};" ubuntu-builder/Dockerfile || exit 0 @@ -33,10 +42,62 @@ all: .docker test -n "${HTTPS_PROXY}" && sed -i "s;INSERT_HTTPS_PROXY;${HTTPS_PROXY};" ubuntu-builder/Dockerfile || exit 0 test -n "${NO_PROXY}" && sed -i "s;INSERT_NO_PROXY;${NO_PROXY};" ubuntu-builder/Dockerfile || exit 0 sed -i '/INSERT_/d' ubuntu-builder/Dockerfile - /usr/bin/docker build --rm=true --no-cache=true -t opnfv.org/ubuntu-builder:14.04 ubuntu-builder - /usr/bin/docker tag ${tag_flags} opnfv.org/ubuntu-builder:14.04 opnfv.org/ubuntu-builder - touch .docker + touch $@ + +.docker: .dockercfg + @if test -f .cacheid -o "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \ + /usr/bin/docker build --rm=true --no-cache=true \ + -t ${DOCKER_TAG} ubuntu-builder && \ + /usr/bin/docker tag ${tag_flags} ${DOCKER_TAG} ${DOCKER_IMG}; \ + else \ + echo "Docker: Tag '${DOCKER_TAG}' was created less than" \ + "${DOCKER_KEEP} ago, skipping re-build."; \ + fi + touch $@ + test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 .PHONY: clean clean: - rm -f .docker ubuntu-builder/Dockerfile + rm -f .docker* ubuntu-builder/Dockerfile + +.PHONY: deepclean +deepclean: clean clean-cache + +############################################################################## +# Cache operations - only used when building through ci/build.sh +############################################################################## + +# NOTE: For docker, we only get/put cache to fingerprint build scripts and +# env vars, its cached data holds only an empty .docker file. + +# Create a unique hash to be used for getting and putting cache, based on: +# - ubuntu-builder Dockerfile (includes eventual proxy env vars), runcontext; +# - The contents of this Makefile +.cacheid: .dockercfg + sha1sum Makefile runcontext $(wildcard ubuntu-builder/*) > .cachedata + cat .cachedata | $(CACHETOOL) getid > .cacheid + +# Clean local data related to caching - called prior to ordinary build +.PHONY: clean-cache +clean-cache: + rm -f .cachedata .cacheid + +# Try to download cache - called prior to ordinary build +.PHONY: get-cache +get-cache: .cacheid + @if $(CACHETOOL) check $(shell cat .cacheid); then \ + if test "$(shell ${DOCKER_EXPIRED})" -eq "0"; then \ + echo "Docker: Tag '${DOCKER_TAG}' missing" \ + "or older than ${DOCKER_KEEP}, not using it."; \ + else \ + touch .docker; \ + fi; \ + else \ + echo "No cache item found for $(shell cat .cacheid)" ;\ + exit 0;\ + fi + +# Store cache if not already stored - called after ordinary build +.PHONY: put-cache +put-cache: .cacheid + @tar cf - .docker | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/docker/runcontext b/build/docker/runcontext index daad663ac..b17571135 100755 --- a/build/docker/runcontext +++ b/build/docker/runcontext @@ -111,11 +111,13 @@ if [ -n "$CACHEBASE" ]; then fi fi +# FIXME: TERM is required because: https://github.com/docker/docker/issues/9299 RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \ + -e TERM=$TERM \ -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \ -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \ - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \ + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \ -u $USER_ID:$GROUP_ID -w $PWD \ -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT" |