From 78872533adf0a04cb3f2007bf49708cc3cef41a4 Mon Sep 17 00:00:00 2001 From: daniele-pavia Date: Tue, 19 Dec 2017 17:41:36 +0100 Subject: [PATCH] added the smartgears-container-home-library.yml playbook, fixed a couple of things to the smartgears-container-home-library role --- smartgears/smartgears-container-home-library/defaults/main.yml | 3 ++- .../smartgears-container-home-library/templates/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/smartgears/smartgears-container-home-library/defaults/main.yml b/smartgears/smartgears-container-home-library/defaults/main.yml index fa78d79..070554e 100644 --- a/smartgears/smartgears-container-home-library/defaults/main.yml +++ b/smartgears/smartgears-container-home-library/defaults/main.yml @@ -1,4 +1,5 @@ -image_name: "smartgears_home_library" +java_jdk: "java8-jdk" #### either java8-jdk or openjdk-8 +image_name: "smartgears-home-library" image_tag: "{{ home_library_war_version }}" push_to_repo: "no" repo: "gcube-staging" diff --git a/smartgears/smartgears-container-home-library/templates/Dockerfile b/smartgears/smartgears-container-home-library/templates/Dockerfile index e4dc1fd..1b1d21f 100644 --- a/smartgears/smartgears-container-home-library/templates/Dockerfile +++ b/smartgears/smartgears-container-home-library/templates/Dockerfile @@ -1,3 +1,3 @@ -FROM smartgears_base_image:{{ smartgears_distribution_version }} +FROM smartgears-base-image-{{ java_jdk }}:{{ smartgears_distribution_version }} ADD {{ home_library_artifact_url }} "{{ catalina_home }}/webapps/"