diff --git a/Jenkinsfile b/Jenkinsfile index 35ba55a..5e7e046 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { } stages { - stage('Build Environmen') { + stage('Build Environment') { steps { script { app = docker.build("${DOCKER_IDENTITY}", '-f docker/Dockerfile-php .') @@ -34,9 +34,7 @@ pipeline { stage('Run containers') { steps { - sh """ - docker compose -f ${DOCKER_COMPOSE_FILE} up -d - """ + sh "docker compose -f ${DOCKER_COMPOSE_FILE} up -d" } } stage('Install dependencies') { @@ -65,8 +63,8 @@ pipeline { success { script { docker.withRegistry('https://index.docker.io/v1/', "${DOCKER_CREDENTIALS}") { - app.push() - nginx.push() + app.push("${DOCKER_IDENTITY}") + nginx.push("${DOCKER_IDENTITY_NGINX}") } } } @@ -81,8 +79,8 @@ pipeline { tools: [ PHPUnit(pattern: 'phpunit.xml') ] ) // Remove containers - sh 'docker compose -f docker-compose-ci.yaml down' - sh 'docker compose -f docker-compose-ci.yaml rm -f' + sh 'docker compose -f ${DOCKER_COMPOSE_FILE} down' + sh 'docker compose -f ${DOCKER_COMPOSE_FILE} rm -f' } } }