diff --git a/Jenkinsfile b/Jenkinsfile index e6188a3..bba5afd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,13 +6,13 @@ node { stage 'Acquire util' - sh 'mkdir -p tmp && mkdir -p bin' - dir('tmp'){ + sh 'mkdir -p tmp && mkdir -p bin' + dir('tmp'){ git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ]) + sh 'rm -rf ../bin/*' sh 'mv ./bin/* ../bin/.' } - sh 'rm -rf tmp' stage 'Setting build context' @@ -74,4 +74,4 @@ def handleError(String message){ slackSend color: 'danger', message: "${message}" //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true]) sh 'exit 1' -} \ No newline at end of file +} diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index bc709b3..29f26cf 100755 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: volumes: - mariadb-data:/var/lib/mysql shibui: - image: tier/shib-idp-ui:1.4.0 + image: tier/shib-idp-ui:1.5.0 depends_on: - db ports: @@ -40,4 +40,4 @@ services: volumes: generated-conf: generated-metadata: - mariadb-data: \ No newline at end of file + mariadb-data: