|
@@ -62,7 +62,7 @@ pipeline {
|
|
|
|
|
|
|
|
def buildImage(baseImage) {
|
|
def buildImage(baseImage) {
|
|
|
def scmvar = checkout(scm)
|
|
def scmvar = checkout(scm)
|
|
|
- def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
|
|
|
|
|
|
|
+ def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
|
|
|
image = docker.image(imageName)
|
|
image = docker.image(imageName)
|
|
|
|
|
|
|
|
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|
|
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|
|
@@ -89,7 +89,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
|
|
|
stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
|
|
stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
|
|
|
node("ubuntu && amd64 && !zfs") {
|
|
node("ubuntu && amd64 && !zfs") {
|
|
|
def scmvar = checkout(scm)
|
|
def scmvar = checkout(scm)
|
|
|
- def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
|
|
|
|
|
|
|
+ def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
|
|
|
def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
|
|
def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
|
|
|
echo "Using local system's storage driver: ${storageDriver}"
|
|
echo "Using local system's storage driver: ${storageDriver}"
|
|
|
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|
|
withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
|