fix build for kernel versions x.x.0 and new path in coreos image

Author: mcuadros

Dockerfile

@@ -11,6 +11,7 @@ ARG COREOS_RELEASE_CHANNEL=stable
 ARG COREOS_VERSION
 ARG NVIDIA_DRIVER_VERSION
 ARG KERNEL_VERSION
+ARG KERNEL_TAG
 
 ENV KERNEL_PATH /usr/src/kernels/linux
 ENV KERNEL_NAME ${KERNEL_VERSION}-coreos
@@ -20,15 +21,15 @@ ENV COREOS_RELEASE_URL https://${COREOS_RELEASE_CHANNEL}.release.core-os.net/amd
 RUN git clone ${KERNEL_REPOSITORY} \
         --single-branch \
         --depth 1 \
-        --branch v${KERNEL_VERSION} \
+        --branch v${KERNEL_TAG} \
         ${KERNEL_PATH}
 
 WORKDIR ${KERNEL_PATH}
 
-RUN git checkout -b stable v${KERNEL_VERSION} && rm -rf .git
+RUN git checkout -b stable v${KERNEL_TAG} && rm -rf .git
 RUN curl ${COREOS_RELEASE_URL}/coreos_developer_container.bin.bz2 | \
         bzip2 -d > /tmp/coreos_developer_container.bin
-RUN 7z e /tmp/coreos_developer_container.bin "usr/lib64/modules/*-coreos/build/.config"
+RUN 7z e /tmp/coreos_developer_container.bin "usr/lib64/modules/*-coreos*/build/.config"
 RUN make modules_prepare
 RUN sed -i -e "s/${KERNEL_VERSION}/${KERNEL_NAME}/" include/generated/utsrelease.h
 

Makefile

@@ -28,8 +28,9 @@ endif
 # the CoreOS release feed.
 KERNEL_VERSION = $(shell \
 	curl -s ${COREOS_RELEASES_URL} | \
-		jq -r .[\"${COREOS_VERSION}\"].major_software.kernel[0] | \
-			sed -e 's/\(\.0\)*$$//g')
+		jq -r .[\"${COREOS_VERSION}\"].major_software.kernel[0])
+
+KERNEL_TAG := $(shell echo ${KERNEL_VERSION} | sed -e 's/\(\.0\)*$$//g')
 
 # Environment
 WORKDIR := $(PWD)
@@ -75,6 +76,7 @@ build: validate
 		--build-arg COREOS_VERSION=$(COREOS_VERSION) \
 		--build-arg NVIDIA_DRIVER_VERSION=$(NVIDIA_DRIVER_VERSION) \
 		--build-arg KERNEL_VERSION=$(KERNEL_VERSION) \
+		--build-arg KERNEL_TAG=$(KERNEL_TAG) \
 		--tag $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(DOCKER_REPOSITORY):$(COREOS_VERSION) \
 		--file $(WORKDIR)/Dockerfile . \