Update Dockerfile LABEL instructions to be compatible with podman #189

engine/docker.sh

@@ -76,7 +76,7 @@ function generate_dockerfile() {
             || die "Error while generating ${image_path}/Dockerfile"
 
     # insert build timestamp last to preserve build cache
-    echo "LABEL kubler.build.timestamp ${build_timestamp}" >> "${image_path}"/Dockerfile
+    echo "LABEL kubler.build.timestamp=${build_timestamp}" >> "${image_path}"/Dockerfile
 }
 
 # Returns given tag value from dockerfile or exit signal 3 if tag was not found.
@@ -265,7 +265,7 @@ function build_image() {
 
         _status_msg="commit ${run_id} as image ${_current_namespace}/${builder_commit_id}:${IMAGE_TAG}"
         # shellcheck disable=SC2086
-        pwrap 'nolog' "${DOCKER}" commit ${DOCKER_COMMIT_OPTS} -c "LABEL kubler.build.timestamp $(date '+%Y%m%d%H%M%S')" \
+        pwrap 'nolog' "${DOCKER}" commit ${DOCKER_COMMIT_OPTS} -c "LABEL kubler.build.timestamp=$(date '+%Y%m%d%H%M%S')" \
             "${run_id}" "${_current_namespace}/${builder_commit_id}:${IMAGE_TAG}" \
             || die "${_status_msg}"
 

engine/docker/bob-core/Dockerfile.template

@@ -1,5 +1,5 @@
 FROM ${BOB_CURRENT_STAGE3_ID}
-LABEL maintainer ${MAINTAINER}
+LABEL maintainer="${MAINTAINER}"
 
 RUN set -x && \
     echo 'GENTOO_MIRRORS="http://distfiles.gentoo.org/"' >> /etc/portage/make.conf && \

engine/docker/bob-portage/Dockerfile.template

@@ -1,6 +1,6 @@
 FROM busybox:latest
 
-LABEL maintainer ${MAINTAINER}
+LABEL maintainer="${MAINTAINER}"
 
 COPY ${BOB_CURRENT_PORTAGE_FILE} /
 

template/docker/builder/Dockerfile.template

@@ -1,4 +1,4 @@
 FROM ${NAMESPACE}/${_tmpl_image_name}
-LABEL maintainer ${MAINTAINER}
+LABEL maintainer="${MAINTAINER}"
 
 CMD ["/bin/bash"]

template/docker/image/Dockerfile.template

@@ -1,5 +1,5 @@
 FROM ${IMAGE_PARENT}
-LABEL maintainer ${MAINTAINER}
+LABEL maintainer="${MAINTAINER}"
 
 ADD rootfs.tar /