From 25eea1828a5443a52aa153e3d0bc06e15cb97380 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sun, 15 Jul 2018 20:07:54 -0700
Subject: [PATCH] moving the credentials down and manually defining the ci env

---
 Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 940c3e6..ba697ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,6 @@ pipeline {
     CI_DELAY = '5'
     TEST_MYSQL_HOST = credentials('mysql_test_host')
     TEST_MYSQL_PASSWORD = credentials('mysql_test_password')
-    CI_DOCKERENV = 'DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}'
     CI_AUTH = 'user:password'
     CI_WEBPATH = ''
   }
@@ -275,7 +274,7 @@ pipeline {
           string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
         ]) {
           sh '''#! /bin/bash
-                docker pull lsiodev/readme-sync
+                docker pull lsiodev/ci
                 docker run --rm \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${CI_IMAGE}\" \
@@ -287,7 +286,7 @@ pipeline {
                 -e BASE=\"${DIST_IMAGE}\" \
                 -e SECRET_KEY=\"${DO_SECRET}\" \
                 -e ACCESS_KEY=\"${DO_KEY}\" \
-                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
+                -e DOCKER_ENV=\"DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
                 -e DO_REGION="ams3" \