ISTI-ansible-roles
/
ansible-roles
5
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

removed/changed references to shinyproxy, removed the token used as placeholder. minor fixes

This commit is contained in:
daniele-pavia 2017-12-18 10:40:46 +01:00
parent 0e549f6d22
commit aa6226f1a0
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smartgears/smartgears-base-image/defaults/main.yml
View File

@ -1,7 +1,13 @@
smartgears_user: "root" repo_type: "repo_groups"
smartgears_user_home: "/root/" repo: "gcube-staging-all"
patch_common_scope: 0
patch_common_authorization: 0
#smartgears_user: "tomcat7" #smartgears_user: "tomcat7"
#smartgears_user_home: "/usr/share/tomcat7/" #smartgears_user_home: "/usr/share/tomcat7/"
smartgears_user: "root"
smartgears_user_home: "/root/"
smartgears_distribution_version: "2.1.3-4.7.0-154641" smartgears_distribution_version: "2.1.3-4.7.0-154641"
smartgears_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/smartgears-distribution-{{ smartgears_distribution_version }}.tar.gz" smartgears_url: "http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/smartgears-distribution-{{ smartgears_distribution_version }}.tar.gz"
smartgears_log_dir: "/var/log/tomcat7" smartgears_log_dir: "/var/log/tomcat7"

2
smartgears/smartgears-base-image/files/smartgears_run.sh
View File

@ -9,12 +9,10 @@
#### let's configure the container #### let's configure the container
#### if no token is set refuse to run #### if no token is set refuse to run
if [[ -z "$CONTAINER_TOKENS" ]]; if [[ -z "$CONTAINER_TOKENS" ]];
## spacchetta_token!
then then
echo "CONTAINER_TOKENS not set, failed to configure the container. Exiting with errors."; echo "CONTAINER_TOKENS not set, failed to configure the container. Exiting with errors.";
exit 1 exit 1
else else
#echo "tokens: $CONTAINER_TOKENS"
OLDIFS=$IFS OLDIFS=$IFS
IFS="," IFS=","
read -r -a tokens <<< "$CONTAINER_TOKENS" read -r -a tokens <<< "$CONTAINER_TOKENS"

2
smartgears/smartgears-base-image/meta/main.yml
View File

@ -1,3 +1,3 @@
dependencies: dependencies:
- role: "../../docker/"
# - role: java-17 # - role: java-17
- role: ../roles/docker

1
smartgears/smartgears-base-image/tasks/main.yml
View File

@ -1,4 +1,3 @@
- name: create temporary build directory - name: create temporary build directory
shell: mktemp -d shell: mktemp -d
register: tempdir register: tempdir

6
smartgears/smartgears-base-image/templates/Dockerfile
View File

@ -7,8 +7,14 @@ ENV GHN_HOME {{ smartgears_user_home }}
WORKDIR {{ smartgears_user_home }} WORKDIR {{ smartgears_user_home }}
ADD {{ smartgears_url }} {{ smartgears_user_home }} ADD {{ smartgears_url }} {{ smartgears_user_home }}
ADD smartgears_run.sh {{ smartgears_user_home }} ADD smartgears_run.sh {{ smartgears_user_home }}
{% if patch_common_scope %}
COPY common-scope-maps-patched.ja* {{ smartgears_user_home }} COPY common-scope-maps-patched.ja* {{ smartgears_user_home }}
{% endif %}
{% if patch_common_authorization %}
COPY common-authorization-patched.ja* {{ smartgears_user_home }} COPY common-authorization-patched.ja* {{ smartgears_user_home }}
{% endif %}
RUN \ RUN \
#### install either the Oracle JDK or OpenJDK #### install either the Oracle JDK or OpenJDK