Merge pull request #2 from quay/dockerfile-refactor

 dockerfile: refactor build

Author: kleesc

Dockerfile

@@ -1,25 +1,35 @@
-FROM centos:8 as executor-img
+FROM centos:8 as base
+ARG channel="stable"
 ARG location
-ARG channel
-ARG version
 
-RUN [ -z "${location}" ] || [ -z "${channel}" ] || [ -z "${version}" ] && echo "ARG location, channel, version are required" && exit 1 || true
+RUN [ -z "${channel}" ] && echo "ARG channel is required" && exit 1 || true
 
-RUN echo "Downloading" ${location}
-RUN curl -s -o coreos_production_qemu_image.qcow2.xz ${location} && unxz coreos_production_qemu_image.qcow2.xz
+RUN yum -y install jq
+RUN curl https://builds.coreos.fedoraproject.org/streams/${channel}.json -o stable.json && \
+	cat stable.json | jq '.architectures.x86_64.artifacts.qemu.release' | tr -d '"'
 
 
-FROM centos:8
-ARG location
-ARG channel
-ARG version
+FROM base AS executor-img
+
+RUN if [[ -z "$arg" ]] ; then \
+	echo "Downloading" $(cat stable.json | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"') && \
+	curl -s -o coreos_production_qemu_image.qcow2.xz $(cat stable.json | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"') && unxz coreos_production_qemu_image.qcow2.xz ; \
+	else \
+	echo "Downloading" ${location} && \
+	curl -s -o coreos_production_qemu_image.qcow2.xz ${location} && unxz coreos_production_qemu_image.qcow2.xz \
+	; fi
+
+
+FROM base AS final
+ARG channel=stable
 
 RUN mkdir -p /userdata
 WORKDIR /userdata
 
 RUN yum -y update && \
-  yum -y install openssh-clients qemu-kvm && \
-  yum -y clean all
+	yum -y remove jq && \
+	yum -y install openssh-clients qemu-kvm && \
+	yum -y clean all
 
 COPY --from=executor-img /coreos_production_qemu_image.qcow2 /userdata/coreos_production_qemu_image.qcow2
 COPY start.sh /userdata/start.sh
@@ -28,6 +38,5 @@ RUN chgrp -R 0 /userdata && \
     chmod -R g=u /userdata
 
 LABEL com.coreos.channel ${channel}
-LABEL com.coreos.version ${version}
 
 ENTRYPOINT ["/bin/bash", "/userdata/start.sh"]

build.sh

@@ -7,11 +7,11 @@ CLOUD_IMAGE=${CLOUD_IMAGE:-""}
 
 if [ -z "$CLOUD_IMAGE" ]; then
     CHANNEL=${CHANNEL:-"stable"}
-    CHANNEL_MANIFEST_JSON=`curl https://builds.coreos.fedoraproject.org/streams/stable.json`
+    CHANNEL_MANIFEST_JSON=`curl https://builds.coreos.fedoraproject.org/streams/${CHANNEL}.json`
     LOCATION=`echo $CHANNEL_MANIFEST_JSON | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"'`
     VERSION=`echo $CHANNEL_MANIFEST_JSON | jq '.architectures.x86_64.artifacts.qemu.release' | tr -d '"'`
 
-    time docker build --build-arg=channel=$CHANNEL --build-arg version=$VERSION --build-arg location=$LOCATION -t $IMAGE:$TAG .
+    time docker build --build-arg=channel=$CHANNEL --build-arg --build-arg -t $IMAGE:$TAG .
 else
-    time docker build --build-arg=channel=$CHANNEL --build-arg version=$VERSION --build-arg location=$CLOUD_IMAGE -t $IMAGE:$TAG .
+    time docker build --build-arg=channel=$CHANNEL --build-arg --build-arg location=$CLOUD_IMAGE -t $IMAGE:$TAG .
 fi