From 88a4f7111167df7c1e2da566521f62a5ca2e195a Mon Sep 17 00:00:00 2001 From: "Tony.Shao" Date: Fri, 20 May 2016 12:24:41 +0800 Subject: [PATCH 1/2] update --- 6/Dockerfile | 4 ++-- 7/Dockerfile | 4 ++-- 8/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index f10e147..bdb148c 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:trusty -MAINTAINER ClouDesire +FROM buildpack-deps:trusty-curl +MAINTAINER Tony.Shao # Install Oracle Java 6 ENV JAVA_VER 6 diff --git a/7/Dockerfile b/7/Dockerfile index 7c09020..79390fa 100644 --- a/7/Dockerfile +++ b/7/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:trusty -MAINTAINER ClouDesire +FROM buildpack-deps:trusty-curl +MAINTAINER Tony.Shao # Install Oracle Java 7 ENV JAVA_VER 7 diff --git a/8/Dockerfile b/8/Dockerfile index b83caf6..4bfd41e 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -1,5 +1,5 @@ -FROM ubuntu:trusty -MAINTAINER ClouDesire +FROM buildpack-deps:trusty-curl +MAINTAINER Tony.Shao # Install Oracle Java 8 ENV JAVA_VER 8 From a745a4521d5af03c60080e28e1a5e0c133308c19 Mon Sep 17 00:00:00 2001 From: "Tony.Shao" Date: Fri, 20 May 2016 12:24:52 +0800 Subject: [PATCH 2/2] update --- jenkins.sh | 2 -- 1 file changed, 2 deletions(-) delete mode 100755 jenkins.sh diff --git a/jenkins.sh b/jenkins.sh deleted file mode 100755 index 17974a7..0000000 --- a/jenkins.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -eu -curl -H "Content-Type: application/json" --data '{"build": true}' -X POST https://registry.hub.docker.com/u/cloudesire/java/trigger/$DOCKER_REGISTRY_JAVA_TRIGGER/