From 05e180123e2f2160b8419c4ca14d8aa348f7ec4c Mon Sep 17 00:00:00 2001 From: Lee Davie Date: Fri, 15 Jun 2018 08:27:55 +0100 Subject: [PATCH 1/2] Amending Version to 3.12.1-01 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a884b33..cb21235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sonatype/nexus3:3.7.1 +FROM sonatype/nexus3:3.12.1 ENV LDAP_ENABLED=true \ From 8387176765bd6f3c00ad0796549d4226ed48bd86 Mon Sep 17 00:00:00 2001 From: Lee Davie Date: Thu, 28 Jun 2018 13:27:26 +0100 Subject: [PATCH 2/2] Removing siesta from scripts as it has been deprecated from REST Endpoints. --- resources/conf/addUpdatescript.groovy | 2 +- resources/provision.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/conf/addUpdatescript.groovy b/resources/conf/addUpdatescript.groovy index 0505b94..b9b39bf 100644 --- a/resources/conf/addUpdatescript.groovy +++ b/resources/conf/addUpdatescript.groovy @@ -24,7 +24,7 @@ def file = new File(options.f) assert file.exists() def host = options.h ?: 'http://localhost:8081' -def resource = 'service/siesta' +def resource = 'service/' ScriptClient scripts = new ResteasyClientBuilder() .build() diff --git a/resources/provision.sh b/resources/provision.sh index 00f42c3..b1b3ef0 100755 --- a/resources/provision.sh +++ b/resources/provision.sh @@ -39,7 +39,7 @@ function addAndRunScript() { classPath=$(find /root/.groovy/grapes -name *.jar) groovy -cp $(echo $classPath | sed 's/ /:/g') -Dgroovy.grape.report.downloads=true resources/conf/addUpdatescript.groovy -u "$username" -p "$password" -n "$name" -f "$file" -h "$nexus_host" printf "\nPublished $file as $name\n\n" - curl -v -X POST -u $username:$password --header "Content-Type: text/plain" "$nexus_host/service/siesta/rest/v1/script/$name/run" -d "$args" + curl -v -X POST -u $username:$password --header "Content-Type: text/plain" "$nexus_host/service/rest/v1/script/$name/run" -d "$args" printf "\nSuccessfully executed $name script\n\n\n" } @@ -113,4 +113,4 @@ if [ -n "${NEXUS_ADMIN_PASSWORD}" ] fi -printf "\nProvisioning Scripts Completed\n\n" \ No newline at end of file +printf "\nProvisioning Scripts Completed\n\n"