Issue #13 Adding a new /etc/os-release file (#16)

Signed-off-by: Lalatendu Mohanty <[email protected]>

Author: LalatenduMohanty

Makefile

@@ -1,8 +1,13 @@
 BUILD_DIR=$(shell pwd)/build
 CODE_DIR=$(shell pwd)/iso
 VERSION=1.0.0
+GITTAG=$(shell git rev-parse --short HEAD)
+DATE=$(shell date +"%d%m%Y%H%M%S")
+ISO_NAME=minishift-b2d
+OSRELEASE_FILE=os-release
+OSRELEASE_TEMPLATE=os-release.template
 
-default: b2d_iso
+default: iso
 
 .PHONY: init
 init:
@@ -11,13 +16,12 @@ init:
 .PHONY: clean
 clean:
 	rm -rf $(BUILD_DIR)
+	rm -f $(CODE_DIR)/$(OSRELEASE_FILE)
 
-.PHONY: b2d_iso
-b2d_iso: ISO_NAME=minishift-b2d
-b2d_iso: iso_creation
-
-.PHONY: iso_creation
-iso_creation: init
+.PHONY: iso
+iso: init
+	#Creating minishift-b2d ISO specific /etc/os-release file.
+	isoname='$(ISO_NAME)' version='$(VERSION)' build_id='$(GITTAG)-$(DATE)' envsubst < $(CODE_DIR)/$(OSRELEASE_TEMPLATE) > $(CODE_DIR)/$(OSRELEASE_FILE)
 	cd $(CODE_DIR); bash build.sh
 
 .PHONY: get_gh-release
@@ -27,7 +31,7 @@ get_gh-release: init
 	rm -fr $(BUILD_DIR)/gh-release_2.2.1_linux_x86_64.tgz
 
 .PHONY: release
-release: b2d_iso get_gh-release
+release: iso get_gh-release
 	rm -rf release && mkdir -p release
 	cp $(BUILD_DIR)/minishift-b2d.iso release/
 	$(BUILD_DIR)/gh-release checksums sha256

iso/Dockerfile

@@ -20,6 +20,13 @@ FROM boot2docker/boot2docker:1.12.3
 RUN echo "1.12.3" > $ROOTFS/etc/version
 ENV DOCKER_SHA a3bb88649bcc47775c29dab7d95709f4dda04d0e
 
+# Removing the code that creates the /etc/os-release file.
+# Refer: https://github.com/boot2docker/boot2docker/blob/master/rootfs/make_iso.sh#L20-L34
+RUN sed -i '/^b2dVersion/,/^EOOS/d' /make_iso.sh
+
+# Add the /etc/os-release file
+ADD os-release $ROOTFS/etc
+
 # Add other dependencies here to $ROOTFS/
 ADD nsenter $ROOTFS/usr/bin/
 ADD socat $ROOTFS/usr/bin

iso/os-release.template

@@ -0,0 +1,9 @@
+NAME=${isoname}
+VERSION=${version}
+BUILD_ID=${build_id}
+ID=boot2docker
+ID_LIKE=tcl
+PRETTY_NAME="Minishift Boot2Docker ISO Version: ${version}"
+ANSI_COLOR="1;34"
+HOME_URL="https://github.com/minishift/minishift-b2d-iso"
+BUG_REPORT_URL="https://github.com/minishift/minishift-b2d-iso/issues"