Dockerfile: put variables inside curly braces (sclorg#130)

Dockerfile: put variables inside curly braces since OSBS had trouble expanding some during build

Author: pkubatrh

5.20/Dockerfile

@@ -23,15 +23,15 @@ LABEL summary="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="Apache 2.4 with mod_perl/$PERL_VERSION" \
       io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,$NAME,$NAME$PERL_SHORT_VER" \
+      io.openshift.tags="builder,${NAME},${NAME}${PERL_SHORT_VER}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="centos/$NAME-$PERL_SHORT_VER-centos7" \
-      com.redhat.component="rh-$NAME$PERL_SHORT_VER-docker" \
+      name="centos/${NAME}-${PERL_SHORT_VER}-centos7" \
+      com.redhat.component="rh-${NAME}${PERL_SHORT_VER}-docker" \
       version="$PERL_VERSION" \
       maintainer="SoftwareCollections.org <[email protected]>" \
-      help="For more information visit https://github.com/sclorg/s2i-$NAME-container" \
-      usage="s2i build <SOURCE-REPOSITORY> centos/$NAME-$PERL_SHORT_VER-centos7:latest <APP-NAME>"
+      help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
+      usage="s2i build <SOURCE-REPOSITORY> centos/${NAME}-${PERL_SHORT_VER}-centos7:latest <APP-NAME>"
 
 # TODO: Cleanup cpanp cache after cpanminus is installed?
 RUN yum install -y centos-release-scl && \

5.20/Dockerfile.rhel7

@@ -23,15 +23,15 @@ LABEL summary="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="Apache 2.4 with mod_perl/$PERL_VERSION" \
       io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,$NAME,$NAME$PERL_SHORT_VER" \
+      io.openshift.tags="builder,${NAME},${NAME}${PERL_SHORT_VER}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="rhscl/$NAME-$PERL_SHORT_VER-rhel7" \
-      com.redhat.component="rh-$NAME$PERL_SHORT_VER-docker" \
+      name="rhscl/${NAME}-${PERL_SHORT_VER}-rhel7" \
+      com.redhat.component="rh-${NAME}${PERL_SHORT_VER}-docker" \
       version="$PERL_VERSION" \
       maintainer="SoftwareCollections.org <[email protected]>" \
-      help="For more information visit https://github.com/sclorg/s2i-$NAME-container" \
-      usage="s2i build <SOURCE-REPOSITORY> rhscl/$NAME-$PERL_SHORT_VER-rhel7:latest <APP-NAME>"
+      help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
+      usage="s2i build <SOURCE-REPOSITORY> rhscl/${NAME}-${PERL_SHORT_VER}-rhel7:latest <APP-NAME>"
 
 # TODO: Cleanup cpanp cache after cpanminus is installed?
 RUN yum install -y yum-utils && \

5.24/Dockerfile

@@ -23,15 +23,15 @@ LABEL summary="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="Apache 2.4 with mod_perl/$PERL_VERSION" \
       io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,$NAME,$NAME$PERL_SHORT_VER" \
+      io.openshift.tags="builder,${NAME},${NAME}${PERL_SHORT_VER}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="centos/$NAME-$PERL_SHORT_VER-centos7" \
-      com.redhat.component="rh-$NAME$PERL_SHORT_VER-docker" \
+      name="centos/${NAME}-${PERL_SHORT_VER}-centos7" \
+      com.redhat.component="rh-${NAME}${PERL_SHORT_VER}-docker" \
       version="$PERL_VERSION" \
       maintainer="SoftwareCollections.org <[email protected]>" \
-      help="For more information visit https://github.com/sclorg/s2i-$NAME-container" \
-      usage="s2i build <SOURCE-REPOSITORY> centos/$NAME-$PERL_SHORT_VER-centos7:latest <APP-NAME>"
+      help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
+      usage="s2i build <SOURCE-REPOSITORY> centos/${NAME}-${PERL_SHORT_VER}-centos7:latest <APP-NAME>"
 
 RUN yum install -y centos-release-scl && \
     yum-config-manager --enable centos-sclo-rh-testing && \

5.24/Dockerfile.rhel7

@@ -23,15 +23,15 @@ LABEL summary="$SUMMARY" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="Apache 2.4 with mod_perl/$PERL_VERSION" \
       io.openshift.expose-services="8080:http" \
-      io.openshift.tags="builder,$NAME,$NAME$PERL_SHORT_VER" \
+      io.openshift.tags="builder,${NAME},${NAME}${PERL_SHORT_VER}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      name="rhscl/$NAME-$PERL_SHORT_VER-rhel7" \
-      com.redhat.component="rh-$NAME$PERL_SHORT_VER-docker" \
+      name="rhscl/${NAME}-${PERL_SHORT_VER}-rhel7" \
+      com.redhat.component="rh-${NAME}${PERL_SHORT_VER}-docker" \
       version="$PERL_VERSION" \
       maintainer="SoftwareCollections.org <[email protected]>" \
-      help="For more information visit https://github.com/sclorg/s2i-$NAME-container" \
-      usage="s2i build <SOURCE-REPOSITORY> rhscl/$NAME-$PERL_SHORT_VER-rhel7:latest <APP-NAME>"
+      help="For more information visit https://github.com/sclorg/s2i-${NAME}-container" \
+      usage="s2i build <SOURCE-REPOSITORY> rhscl/${NAME}-${PERL_SHORT_VER}-rhel7:latest <APP-NAME>"
 
 RUN yum install -y yum-utils && \
     yum-config-manager --disable \* &> /dev/null && \