Skip to content

Commit

Permalink
Revert "replace common exports with reusable shell scripts"
Browse files Browse the repository at this point in the history
This reverts commit 5fde958
  • Loading branch information
rickyliumerkle committed Oct 8, 2019
1 parent 5fde958 commit a326fe8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM aemdesign/openjdk:jdk8
FROM aemdesign/oracle-jdk:jdk8

MAINTAINER devops <[email protected]>

LABEL os="centos 7" \
container.description="java and ffmpeg" \
image.source="https://github.com/jrottenberg/ffmpeg/tree/master/docker-images" \
version="openjdk8" \
version="1.0.0" \
imagename="java-ffmpeg" \
test.command=" java -version 2>&1 | grep 'java version' | sed -e 's/.*java version "\(.*\)".*/\1/'" \
test.command.verify="1.8"
Expand Down

0 comments on commit a326fe8

Please sign in to comment.