Revert "fix broken Dockerfile due to ARG (huh?! but fixes #206)"

This reverts commit a9bd456.

see #206

java/images/centos/Dockerfile

@@ -1,5 +1,8 @@
 FROM centos:7.5.1804
 
+ARG EXPOSE_PORT=8080
+EXPOSE ${EXPOSE_PORT}
+
 ENV JOLOKIA_VERSION="1.6.0" \
  PROMETHEUS_JMX_EXPORTER_VERSION="0.3.1" \
  PATH=$PATH:"/usr/local/s2i" \
@@ -121,6 +124,3 @@ COPY settings.xml /opt/jboss/.m2/settings.xml
 # Use the run script as default since we are working as an hybrid image which can be
 # used directly to. (If we were a plain s2i image we would print the usage info here)
 CMD [ "/usr/local/s2i/run" ]
-
-# https://github.com/fabric8io-images/s2i/issues/115
-EXPOSE 8080

java/images/fedora-java11/Dockerfile

@@ -1,5 +1,8 @@
 FROM fedora:29
 
+ARG EXPOSE_PORT=8080
+EXPOSE ${EXPOSE_PORT}
+
 ENV JOLOKIA_VERSION="1.6.0" \
  PROMETHEUS_JMX_EXPORTER_VERSION="0.3.1" \
  PATH=$PATH:"/usr/local/s2i" \
@@ -121,6 +124,3 @@ COPY settings.xml /opt/jboss/.m2/settings.xml
 # Use the run script as default since we are working as an hybrid image which can be
 # used directly to. (If we were a plain s2i image we would print the usage info here)
 CMD [ "/usr/local/s2i/run" ]
-
-# https://github.com/fabric8io-images/s2i/issues/115
-EXPOSE 8080

java/images/rhel/Dockerfile

@@ -1,5 +1,8 @@
 FROM jboss/openjdk18-rhel7:1.1-7
 
+ARG EXPOSE_PORT=8080
+EXPOSE ${EXPOSE_PORT}
+
 ENV JOLOKIA_VERSION="1.5.0" \
  PROMETHEUS_JMX_EXPORTER_VERSION="0.10" \
  PATH=$PATH:"/usr/local/s2i" \
@@ -109,6 +112,3 @@ COPY settings.xml /home/jboss/.m2/settings.xml
 # Use the run script as default since we are working as an hybrid image which can be
 # used directly to. (If we were a plain s2i image we would print the usage info here)
 CMD [ "/usr/local/s2i/run" ]
-
-# https://github.com/fabric8io-images/s2i/issues/115
-EXPOSE 8080

java/templates/Dockerfile

@@ -3,6 +3,9 @@
  var mavenVersion = fp.config.base.version.maven;
 }}FROM {{= fp.config.base.from }}
 
+ARG EXPOSE_PORT=8080
+EXPOSE ${EXPOSE_PORT}
+
 ENV JOLOKIA_VERSION="{{= fp.config.base.version.jolokia }}" \
  PROMETHEUS_JMX_EXPORTER_VERSION="{{= fp.config.base.version.jmxexporter }}" \
  PATH=$PATH:"/usr/local/s2i" \
@@ -116,6 +119,3 @@ COPY settings.xml /opt/jboss/.m2/settings.xml
 # Use the run script as default since we are working as an hybrid image which can be
 # used directly to. (If we were a plain s2i image we would print the usage info here)
 CMD [ "/usr/local/s2i/run" ]
-
-# https://github.com/fabric8io-images/s2i/issues/115
-EXPOSE 8080

test.sh

@@ -123,5 +123,5 @@ function test_image() {
 # ==================================================================================
 
 cd java ; fish-pepper ; cd ..
-test_image "java/images/fedora-java11/" "s2i-java-11"
+test_image "java/images/fedora-java11/" "s2i-java"
 test_image "java/images/centos/" "s2i-java"