Merge pull request #48 from jcvenegas/agent_os_versions

Install agent from sources

Author: Julio Montes

Makefile

@@ -26,16 +26,23 @@ BUILD_PROXY += --build-arg https_proxy=$(https_proxy)
 RUN_PROXY += --env https_proxy=$(https_proxy)
 endif
 
+RUN_OS_VERSION= --env OS_VERSION="$(OS_VERSION)"
+RUN_AGENT_VERSION= --env AGENT_VERSION="$(AGENT_VERSION)"
 RUN_EXTRA_PKGS = --env EXTRA_PKGS="$(EXTRA_PKGS)"
 RUN_IMG_SIZE = --env IMG_SIZE="$(IMG_SIZE)"
 RUN_REPO_URL = --env REPO_URL="$(REPO_URL)"
 RUN_DEBUG = --env DEBUG="$(DEBUG)"
+CONTAINER_GOPATH = /go_path
+RUN_GOPATH += --env GOPATH="$(CONTAINER_GOPATH)"
 
 IMAGE_BUILDER = cc-osbuilder
 WORKDIR ?= $(CURDIR)/workdir
 MK_DIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 OS_BUILDER ?= $(MK_DIR)/scripts/osbuilder.sh
-
+RUNTIME_VERSIONS = "https://raw.githubusercontent.com/clearcontainers/runtime/master/versions.txt"
+#get go_version=<version>
+GO_VERSION = $(shell curl -sL $(RUNTIME_VERSIONS) | grep '^go_version=' | cut -d= -f2)
+BUILD_GO_VERSION+= --build-arg GO_VERSION=$(GO_VERSION)
 
 # Installation variables
 DESTDIR :=
@@ -69,13 +76,19 @@ OS_BUILDER = docker run \
 			--privileged \
 			-v /dev:/dev \
 			$(RUN_PROXY) \
+			$(RUN_OS_VERSION) \
+			$(RUN_AGENT_VERSION) \
 			$(RUN_EXTRA_PKGS) \
 			$(RUN_IMG_SIZE) \
 			$(RUN_REPO_URL) \
+			$(RUN_GOPATH) \
 			$(RUN_DEBUG) \
 			-i \
-			-v $(WORKDIR):/osbuilder \
-			$(IMAGE_BUILDER)
+			-v $(MK_DIR):/osbuilder \
+			-v $(WORKDIR):/workdir \
+			-v $(GOPATH):$(CONTAINER_GOPATH)\
+			$(IMAGE_BUILDER) \
+			/osbuilder/scripts/osbuilder.sh
 endif
 rootfs: $(WORKDIR) $(DOCKER_DEPS)
 	cd $(WORKDIR) && $(OS_BUILDER) rootfs
@@ -99,10 +112,13 @@ kernel-src: $(WORKDIR) $(DOCKER_DEPS)
 
 docker-build:
 	cd scripts; \
-	docker build $(BUILD_PROXY) -t $(IMAGE_BUILDER) . 
+	docker build $(BUILD_PROXY) $(BUILD_GO_VERSION) -t $(IMAGE_BUILDER) .
 
 clean:
-	rm -rf "$(WORKDIR)/rootfs" "$(WORKDIR)/linux" "$(WORKDIR)/img"
+	sudo rm -rf "$(WORKDIR)/rootfs"
+	rm -rf "$(WORKDIR)/linux"
+	rm -rf "$(WORKDIR)/img"
+	rm -f $(WORKDIR)/clear-dnf.conf  $(WORKDIR)/container.img
 
 $(WORKDIR):
 	mkdir -p $(WORKDIR)
@@ -199,6 +215,9 @@ install-image:
 
 Environment Variables:
 
+- AGENT_VERSION:
+	Agent tag/commit/branch to install when building rootfs.
+
 - DEBUG
 
 - EXTRA_PKGS:
@@ -209,6 +228,9 @@ Environment Variables:
 	Change the image size of the image to generate (accepts any value
 	recognised by qemu-img(1)).
 
+- OS_VERSION:
+	Clear Linux version to use as base rootfs.
+
 - PKG_MANAGER
 	Specify the path to dnf or yum.
 

scripts/Dockerfile

@@ -17,13 +17,14 @@
 
 From fedora:27
 
-RUN dnf install -y qemu-img parted gdisk make gcc bc git e2fsprogs
+RUN dnf install -y qemu-img parted gdisk make gcc bc git e2fsprogs libudev-devel pkgconfig
 
-ENV workdir /osbuilder
-WORKDIR ${workdir}
+ARG GO_VERSION
 
-COPY osbuilder.sh         /usr/bin
-COPY image_builder.sh     /usr/bin
-COPY kernel_builder.sh    /usr/bin
+RUN cd /tmp && curl -OL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
+RUN tar -C /usr/ -xzf /tmp/go${GO_VERSION}.linux-amd64.tar.gz
+ENV GOROOT=/usr/go
+ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
 
-ENTRYPOINT ["/usr/bin/osbuilder.sh"]
+ENV workdir /workdir
+WORKDIR ${workdir}

scripts/config.txt

@@ -0,0 +1,3 @@
+# Agent version/commit/tag to use.
+
+AGENT_VERSION=${AGENT_VERSION:-master}

scripts/osbuilder.sh

@@ -24,8 +24,17 @@ fi
 
 SCRIPT_NAME="${0##*/}"
 SCRIPT_DIR="$(dirname $(realpath -s $0))"
-REPO_URL=${REPO_URL:-https://download.clearlinux.org/current/x86_64/os/}
-EXTRA_PKGS=${EXTRA_PKGS:-""}
+source "${SCRIPT_DIR}/config.txt"
+# This is defined in config.txt
+OS_VERSION=${OS_VERSION}
+VERSIONS_FILE="https://raw.githubusercontent.com/clearcontainers/runtime/master/versions.txt"
+
+if [ -z "${OS_VERSION}" ]; then
+	OS_VERSION="$(curl -Ls ${VERSIONS_FILE} | grep '^clear_vm_image_version=' | cut -d= -f 2)"
+fi
+
+REPO_URL=${REPO_URL:-https://download.clearlinux.org/releases/${OS_VERSION}/clear/x86_64/os/}
+AGENT_REPOSITORY="github.com/clearcontainers/agent"
 
 
 IMAGE_BUILDER_SH="image_builder.sh"
@@ -39,6 +48,7 @@ if ! type ${KERNEL_BUILDER_SH} >/dev/null 2>&1; then
 fi
 
 ROOTFS_DIR="$(pwd)/rootfs"
+IMAGE_INFO_FILE="$(pwd)/image_info"
 
 die()
 {
@@ -124,14 +134,35 @@ build_rootfs()
 		${EXTRA_PKGS} \
 		systemd \
 		coreutils-bin \
-		systemd-bootchart \
 		iptables-bin \
-		clear-containers-agent \
+		clr-power-tweaks \
 		procps-ng-bin
 
+	cat > ${IMAGE_INFO_FILE} << EOT
+[packages]
+$(rpm -qa --root="${ROOTFS_DIR}")
+EOT
 	[ -n "${ROOTFS_DIR}" ]  && rm -r "${ROOTFS_DIR}/var/cache/dnf"
 }
 
+install_agent()
+{
+	go get ${AGENT_REPOSITORY}
+	pushd "${GOPATH}/src/${AGENT_REPOSITORY}"
+	git fetch origin
+	git checkout ${AGENT_VERSION}
+	git pull || true
+	make
+	make install DESTDIR="${ROOTFS_DIR}"
+
+	cat >> ${IMAGE_INFO_FILE} << EOT
+
+[agent]
+version=$(git log --pretty=format:'%h' -n 1)
+EOT
+	popd
+}
+
 
 check_root()
 {
@@ -161,6 +192,7 @@ case "$BUILD" in
         rootfs)
 			check_root
 			build_rootfs
+			install_agent
             ;;
 
         kernel-src)