You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2018/02/07 22:12:37 UTC
[geode] branch develop updated: Use openjdk:8 for base docker image.
This is an automated email from the ASF dual-hosted git repository.
abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c248b1e Use openjdk:8 for base docker image.
c248b1e is described below
commit c248b1e6afb80bc94ee02322f61ae4063f51860d
Author: Vince Ford <vf...@pivotal.io>
AuthorDate: Wed Feb 7 12:30:49 2018 -0800
Use openjdk:8 for base docker image.
Signed-off-by: Sean Goller <sg...@pivotal.io>
---
ci/docker/Dockerfile | 8 +++-----
ci/pipelines/docker-images.yml | 9 ++++++++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index de47a86..ecbca46 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -13,16 +13,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM apachegeode/geode-build
+FROM openjdk:8
ENTRYPOINT []
# apt prerequisites for installing docker and gcloud
+RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
+RUN apt-key adv --keyserver hkp://pgp.mit.edu --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
RUN apt-get update
RUN apt-get install -y apt-transport-https ca-certificates aptitude lsb-release jq unzip vim htop golang cgroupfs-mount
-RUN apt-key adv --keyserver hkp://pgp.mit.edu --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
-
-# Setup APT repostories
ADD docker.list /etc/apt/sources.list.d/
RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
diff --git a/ci/pipelines/docker-images.yml b/ci/pipelines/docker-images.yml
index afa7461..7f4e0a9 100644
--- a/ci/pipelines/docker-images.yml
+++ b/ci/pipelines/docker-images.yml
@@ -33,6 +33,12 @@ resources:
password: ((!docker-password))
repository: gcr.io/apachegeode-ci/((!docker-image-name))
+- name: openjdk8-docker-image
+ type: docker-image
+ source:
+ repository: openjdk
+ tag: 8
+ skip_download: true
jobs:
# apachegeode-build-concourse
- name: build-apachegeode-build-concourse-docker-image
@@ -40,10 +46,11 @@ jobs:
serial: true
plan:
- aggregate:
+ - get: openjdk8-docker-image
+ trigger: true
- get: apachegeode-build-concourse-dockerfile
trigger: true
- put: apachegeode-build-concourse-docker-image
params:
build: apachegeode-build-concourse-dockerfile/ci/docker
tag_as_latest: true
-
--
To stop receiving notification emails like this one, please contact
abaker@apache.org.