also fix broken Karaf build, by ditching Java 8 package minor version…

… number (fixes #206)
fabric8io-images · Dec 6, 2018 · 8bad895 · 8bad895
1 parent b57b0df
commit 8bad895
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/karaf/images.yml b/karaf/images.yml
@@ -17,7 +17,6 @@ config:
  home: "/opt/jboss"
  description: "CentOS S2I Karaf builder image with OpenJDK 8"
  version:
- java: "1.8.0.181-3.b13.el7_5"
  maven: "3.5.4"
  jolokia: "1.6.0"
  karaf: "4.0.8"

diff --git a/karaf/images/centos/Dockerfile b/karaf/images/centos/Dockerfile
@@ -33,8 +33,8 @@ USER root
 
 # Dowload Maven from Apache
 RUN yum install -y \
- java-1.8.0-openjdk-1.8.0.181-3.b13.el7_5 \
- java-1.8.0-openjdk-devel-1.8.0.181-3.b13.el7_5 \
+ java-1.8.0-openjdk \
+ java-1.8.0-openjdk-devel \
  && curl https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz | \
  tar -xzf - -C /opt \
  && ln -s /opt/apache-maven-3.5.4 /opt/maven \

diff --git a/karaf/templates/Dockerfile b/karaf/templates/Dockerfile
@@ -41,8 +41,8 @@ RUN yum install -y --enablerepo=jboss-rhel-rhscl rh-maven33-maven \
 {{??}}
 # Dowload Maven from Apache
 RUN yum install -y \
- java-1.8.0-openjdk-{{= fp.config.base.version.java}} \
- java-1.8.0-openjdk-devel-{{= fp.config.base.version.java}} \
+ java-1.8.0-openjdk \
+ java-1.8.0-openjdk-devel \
  && curl https://archive.apache.org/dist/maven/maven-3/{{= mavenVersion }}/binaries/apache-maven-{{= mavenVersion }}-bin.tar.gz | \
  tar -xzf - -C /opt \
  && ln -s /opt/apache-maven-{{= mavenVersion }} /opt/maven \