Skip to content

Commit 7a8c2ee

Browse files
committed
precreate folder to prevent perm issues, fix d2 filename, don't generate svg
1 parent 6dd3388 commit 7a8c2ee

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

roles/generate-jenkins/templates/Jenkinsfile.j2

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,10 @@ pipeline {
528528
sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
529529
sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
530530
fi
531-
docker run -d --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:{{ release_tag }}
532-
yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-{{ ls_branch }}.d2\\")" readme-vars.yml || :
533-
if [[ $(grep -hs ^ readme-vars.yml | md5sum | cut -c1-8) != $(grep -hs ^ ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | md5sum | cut -c1-8) ]]; then
531+
mkdir -p ${TEMPDIR}/d2
532+
docker run -d --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:{{ release_tag }}
533+
yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-{{ release_tag }}.d2\\")" readme-vars.yml || :
534+
if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
534535
echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
535536
mkdir -p ${TEMPDIR}/repo
536537
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}

0 commit comments

Comments
 (0)