From 60bcda46531337d5a62d68616a28dcaab86951a5 Mon Sep 17 00:00:00 2001 From: ampersand8 Date: Thu, 13 Sep 2018 14:06:55 +0200 Subject: [PATCH] #143: Uset setup_docker.sh script --- .circleci/config.yml | 2 +- docker/setup_docker.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28379b4b0..fcd78dbc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,6 @@ jobs: - run: sudo apt-get update && sudo apt-get install openjdk-8-jdk && sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - run: sudo keytool -importkeystore -srckeystore broker/src/functional-test/resources/credhub_client.jks -srcstorepass changeit -destkeystore $(readlink -f /usr/bin/java | sed "s:bin/java::")/lib/security/cacerts -deststorepass changeit - run: 'if [[ -z "${CIRCLE_PULL_REQUEST}" ]]; then openssl aes-256-cbc -md md5 -pass pass:$ENCRYPTION_PASSWORD -in secring.gpg.enc -out local.secring.gpg -d; fi' - - run: ./docker/setup_shield.sh + - run: ./docker/setup_docker.sh - run: ./gradlew clean build -x functionalTest - run: ./circleci-publish.sh diff --git a/docker/setup_docker.sh b/docker/setup_docker.sh index c03b7aafb..cac414e43 100755 --- a/docker/setup_docker.sh +++ b/docker/setup_docker.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x mkdir -p vaultstorage s3data minio_config/certs ./generate_cert -ca --host "minio" mv cert.pem minio_config/certs/public.crt