Skip to content

Commit 25eea18

Browse files
committed
moving the credentials down and manually defining the ci env
1 parent 75c5d79 commit 25eea18

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Jenkinsfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ pipeline {
3535
CI_DELAY = '5'
3636
TEST_MYSQL_HOST = credentials('mysql_test_host')
3737
TEST_MYSQL_PASSWORD = credentials('mysql_test_password')
38-
CI_DOCKERENV = 'DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}'
3938
CI_AUTH = 'user:password'
4039
CI_WEBPATH = ''
4140
}
@@ -275,7 +274,7 @@ pipeline {
275274
string(credentialsId: 'spaces-secret', variable: 'DO_SECRET')
276275
]) {
277276
sh '''#! /bin/bash
278-
docker pull lsiodev/readme-sync
277+
docker pull lsiodev/ci
279278
docker run --rm \
280279
-v /var/run/docker.sock:/var/run/docker.sock \
281280
-e IMAGE=\"${CI_IMAGE}\" \
@@ -287,7 +286,7 @@ pipeline {
287286
-e BASE=\"${DIST_IMAGE}\" \
288287
-e SECRET_KEY=\"${DO_SECRET}\" \
289288
-e ACCESS_KEY=\"${DO_KEY}\" \
290-
-e DOCKER_ENV=\"${CI_DOCKERENV}\" \
289+
-e DOCKER_ENV=\"DB_HOST=${TEST_MYSQL_HOST}|DB_DATABASE=bookstack|DB_USERNAME=root|DB_PASSWORD=${TEST_MYSQL_PASSWORD}\" \
291290
-e WEB_AUTH=\"${CI_AUTH}\" \
292291
-e WEB_PATH=\"${CI_WEBPATH}\" \
293292
-e DO_REGION="ams3" \

0 commit comments

Comments
 (0)