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

fabric8io-images · Dec 6, 2018 · a9bd456 · a9bd456
1 parent 81f8c28
commit a9bd456
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/java/images/centos/Dockerfile b/java/images/centos/Dockerfile
@@ -1,8 +1,5 @@
 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" \
@@ -124,3 +121,6 @@ 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
diff --git a/java/images/fedora-java11/Dockerfile b/java/images/fedora-java11/Dockerfile
@@ -1,8 +1,5 @@
 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" \
@@ -124,3 +121,6 @@ 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
diff --git a/java/images/rhel/Dockerfile b/java/images/rhel/Dockerfile
@@ -1,8 +1,5 @@
 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" \
@@ -112,3 +109,6 @@ 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
diff --git a/java/templates/Dockerfile b/java/templates/Dockerfile
@@ -3,9 +3,6 @@
  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" \
@@ -119,3 +116,6 @@ 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
diff --git a/test.sh b/test.sh
@@ -123,5 +123,5 @@ function test_image() {
 # ==================================================================================
 
 cd java ; fish-pepper ; cd ..
-test_image "java/images/fedora-java11/" "s2i-java"
+test_image "java/images/fedora-java11/" "s2i-java-11"
 test_image "java/images/centos/" "s2i-java"