Skip to content
Permalink
Browse files

Removing JDK from release image

  • Loading branch information...
Jim Van Fleet
Jim Van Fleet committed Aug 18, 2016
1 parent 2c7504c commit a94fec2c37d9827e9c447eba79aa555ed612fd44
Showing with 2 additions and 12 deletions.
  1. +0 −10 Dockerfile
  2. +2 −2 tests/shibboleth-idp.bats
@@ -16,16 +16,6 @@ LABEL ImageName=$imagename
LABEL ImageOS=centos7
LABEL Version=$VERSION

ENV JAVA_VERSION 8u101
ENV BUILD_VERSION b13

RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm && \
yum -y install /tmp/jdk-8-linux-x64.rpm && \
rm -f /tmp/jdk-8-linux-x64.rpm && \
alternatives --install /usr/bin/java jar /usr/java/latest/bin/java 200000 && \
alternatives --install /usr/bin/javaws javaws /usr/java/latest/bin/javaws 200000 && \
alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 200000

RUN yum -y install \
apr-devel \
httpd \
@@ -17,9 +17,9 @@ load ../common
[ "$result" != '' ]
}

@test "Contains java" {
@test "Does not contain java" {
run docker run -i $maintainer/$imagename which java
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
}

@test "Contains tomcat" {

0 comments on commit a94fec2

Please sign in to comment.
You can’t perform that action at this time.