diff --git a/Dockerfile b/Dockerfile index 19f5bb6..9213090 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,22 +14,21 @@ ENV RAILS_ENV="production" \ DOCKER_TAG=lscr.io/linuxserver/manyfold:${VERSION} \ PORT=3214 \ RAILS_SERVE_STATIC_FILES=true \ - APP_VERSION=${MANYFOLD_VERSION} + APP_VERSION=${MANYFOLD_VERSION} \ + HOME=/config RUN \ apk add --no-cache \ assimp-dev \ file \ gcompat \ - glfw \ imagemagick \ imagemagick-heic \ imagemagick-jpeg \ imagemagick-webp \ + jemalloc \ libarchive \ - libstdc++ \ mariadb-connector-c \ - mesa-gl \ pciutils \ postgresql16-client \ ruby \ @@ -83,7 +82,9 @@ RUN \ build-dependencies && \ rm -rf \ $HOME/.bundle/cache \ - $HOME/.composer \ + $HOME/.cache \ + $HOME/.npm \ + $HOME/.yarn \ /app/www/node_modules/ \ /app/www/tmp/cache/ \ /app/www/vendor/bundle/ruby/3.3.0/cache/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b57eb0d..1da3279 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,22 +14,21 @@ ENV RAILS_ENV="production" \ DOCKER_TAG=lscr.io/linuxserver/manyfold:${VERSION} \ PORT=3214 \ RAILS_SERVE_STATIC_FILES=true \ - APP_VERSION=${MANYFOLD_VERSION} + APP_VERSION=${MANYFOLD_VERSION} \ + HOME=/config RUN \ apk add --no-cache \ assimp-dev \ file \ gcompat \ - glfw \ imagemagick \ imagemagick-heic \ imagemagick-jpeg \ imagemagick-webp \ + jemalloc \ libarchive \ - libstdc++ \ mariadb-connector-c \ - mesa-gl \ pciutils \ postgresql16-client \ ruby \ @@ -83,7 +82,9 @@ RUN \ build-dependencies && \ rm -rf \ $HOME/.bundle/cache \ - $HOME/.composer \ + $HOME/.cache \ + $HOME/.npm \ + $HOME/.yarn \ /app/www/node_modules/ \ /app/www/tmp/cache/ \ /app/www/vendor/bundle/ruby/3.3.0/cache/* \ diff --git a/Jenkinsfile b/Jenkinsfile index d3abd3c..d5530f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1009,26 +1009,26 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Auto-generating release notes" - sh '''if [ "$(git tag --points-at HEAD)" != "" ]; then - echo "Existing tag points to current commit, suggesting no new LS changes" - AUTO_RELEASE_NOTES="No changes" - else - AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \ - -d '{"tag_name":"'${META_TAG}'",\ - "target_commitish": "main"}' \ - | jq -r '.body' | sed 's|## What.s Changed||') - fi''' - echo "Pushing New tag for current commit ${META_TAG}" - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${META_TAG}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\ - "type": "commit",\ - "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' - echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo "Auto-generating release notes" + if [ "$(git tag --points-at HEAD)" != "" ]; then + echo "Existing tag points to current commit, suggesting no new LS changes" + AUTO_RELEASE_NOTES="No changes" + else + AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \ + -d '{"tag_name":"'${META_TAG}'",\ + "target_commitish": "main"}' \ + | jq -r '.body' | sed 's|## What.s Changed||') + fi + echo "Pushing New tag for current commit ${META_TAG}" + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ + -d '{"tag":"'${META_TAG}'",\ + "object": "'${COMMIT_SHA}'",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\ + "type": "commit",\ + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' + echo "Pushing New release for Tag" + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json jq -n \ --arg tag_name "$META_TAG" \ --arg target_commitish "main" \ @@ -1042,7 +1042,8 @@ pipeline { "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes), "draft": false, "prerelease": false }' > releasebody.json.done - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' + curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done + ''' } } // Add protection to the release branch