Skip to content

Commit

Permalink
replace common exports with reusable shell scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
rickyliumerkle committed Oct 8, 2019
1 parent 4d77db8 commit 5fde958
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
- 'docker'

before_install:
- source <(curl -s https://raw.githubusercontent.com/aem-design/aemdesign-docker/master/scripts/travis/get_config.sh)
- source <(curl -s https://raw.githubusercontent.com/aem-design/aemdesign-docker/master/scripts/travis/get_version.sh)
- "source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/get_config.sh)"
- "source <(curl -sL https://github.com/aem-design/aemdesign-docker/releases/latest/download/get_version.sh)"

#build and test
install:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM aemdesign/oracle-jdk:jdk8
FROM aemdesign/openjdk: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="1.0.0" \
version="openjdk8" \
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 5fde958

Please sign in to comment.