Skip to content

Commit f61ad90

Browse files
committed
Hotfix Jenkinsfiles with typos in env var names
1 parent d7f63fa commit f61ad90

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docker/dataverse-k8s/Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void setBuildStatus(String message, String state) {
1111
pipeline {
1212
agent any
1313
environment {
14-
DOCKER_IMAGE = "iqss/dataverse-k8s"
14+
DOCKER_IMAGE_NAME = "iqss/dataverse-k8s"
1515
DOCKER_IMAGE_TAG = "build-${env.BRANCH_NAME}"
1616
DOCKER_FILE = "./docker/dataverse-k8s/glassfish/Dockerfile"
1717
DOCKER_WORKDIR = "."
@@ -36,7 +36,7 @@ pipeline {
3636
}
3737
steps {
3838
script {
39-
docker_image = docker.build("${env.DOCKER_IMAGE}:${env.DOCKER_IMAGE_TAG}", "--pull -f ${env.DOCKER_FILE} ${env.DOCKER_WORKDIR}")
39+
docker_image = docker.build("${env.DOCKER_IMAGE_NAME}:${env.DOCKER_IMAGE_TAG}", "--pull -f ${env.DOCKER_FILE} ${env.DOCKER_WORKDIR}")
4040
}
4141
}
4242
}

docker/solr-k8s/Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void setBuildStatus(String message, String state) {
1111
pipeline {
1212
agent any
1313
environment {
14-
DOCKER_IMAGE = "iqss/solr-k8s"
14+
DOCKER_IMAGE_NAME = "iqss/solr-k8s"
1515
DOCKER_IMAGE_TAG = "build-${env.BRANCH_NAME}"
1616
DOCKER_WORKDIR = "docker/solr-k8s"
1717
DOCKER_HUB_CRED = "dockerhub-dataversebot"
@@ -35,7 +35,7 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker_image = docker.build("${env.DOCKER_IMAGE}:${env.DOCKER_IMAGE_TAG}", "--pull ${env.DOCKER_WORKDIR}")
38+
docker_image = docker.build("${env.DOCKER_IMAGE_NAME}:${env.DOCKER_IMAGE_TAG}", "--pull ${env.DOCKER_WORKDIR}")
3939
}
4040
}
4141
}
@@ -58,7 +58,7 @@ pipeline {
5858
}
5959
steps {
6060
script {
61-
docker.withRegistry("${env.DOCKER_REGISTRY}", "${env.DOCKER_HUB_LOGIN}") {
61+
docker.withRegistry("${env.DOCKER_REGISTRY}", "${env.DOCKER_HUB_CRED}") {
6262
docker_image.push("${env.DOCKER_IMAGE_TAG}")
6363
}
6464
}

docs/images/push-description.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TOKEN=$(curl -sS -f -H "Content-Type: application/json" -X POST -d ${LOGIN_PAYLO
1919

2020
# Send a PATCH request to update the description of the repository
2121
echo "Sending PATCH request"
22-
REPO_URL="https://hub.docker.com/v2/repositories/${DOCKER_IMAGE}/"
22+
REPO_URL="https://hub.docker.com/v2/repositories/${DOCKER_IMAGE_NAME}/"
2323
RESPONSE_CODE=$(curl -sS -f --write-out %{response_code} --output /dev/null -H "Authorization: JWT ${TOKEN}" -X PATCH --data-urlencode full_description@${DESCRIPTION_FILE} ${REPO_URL})
2424
echo "Received response code: $RESPONSE_CODE"
2525

0 commit comments

Comments
 (0)