Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Monthly update #95

Merged
merged 25 commits into from
Feb 11, 2021
Merged

Monthly update #95

merged 25 commits into from
Feb 11, 2021

Conversation

aptalca
Copy link
Member

@aptalca aptalca commented Feb 10, 2021 •
edited
Loading

  • Convert the templating to a 3 stage process:
    • Update Jenkinsfile
    • Delete old templates
    • Update the rest of the templates
  • Move external templates (readme lite, documentation and unraid template) to a folder named .jenkins-external so they can be easily deleted when run locally
  • Add .jenkins-external to .gitignore if not already in there
  • Enable docker-ci updates and fix the ghcr image name in Jenkinsfiles (currently incorrectly pointing to branch pushed images) (requires update baseimage and templates docker-ci#16 merged first)
  • Enable readme-sync updates and fix the ghcr image name in Jenkinsfiles (currently incorrectly pointing to branch pushed images) (requires add external folder support docker-readme-sync#20 merged first)
  • Rebase to alpine 3.13, use the ghcr.io endpoint for baseimage
  • Prepend github releases with branch/tag if not latest
  • Unraid template updates:
    • Add bash as the default shell, as it is in both type of baseimage.
    • Moves /config to advanced section.
    • Set defaults, as PUID, PGID and umask.
    • Filters away umask from readmevars input.
    • Introduces optional var env_options to create a drop-down style selector for allowed entries.
  • alpine version trigger: Use APKINDEX instead of running an alpine container to access apk

aptalca and others added 25 commits January 12, 2021 14:00
@aptalca
check & update Jenkinsfile before other templates
4750c82
@aptalca
move external templates to dedicated folder
9553a76 
remove old issue template
@aptalca
Add delete stage to templating
ff9f477 
This makes the templating a 3 stage process:
1. Update jenkinsfile
2. Delete old templates
3. Update templates
@aptalca
fix readme-sync image name
50fdd13
@aptalca
fix ci tester image name
40ff325
@Roxedus
More default variables
528bbc5
@Roxedus
Escape strings that may have characters XML does like.
c7b9d04
@Roxedus
Fix some whitespace
165dc99
@aptalca
change folder external to .jenkins-external
b438113
@aptalca
missed a couple of references to external
5dc7054
@aptalca
add .jenkins-external to .gitignore
43b6aea
@nemchik
Add markdown title to documentation
6c3f89d
@aptalca
Merge pull request #92 from linuxserver/monthly-docs
9e6c983 
Add markdown title to documentation
@nemchik
Get alpine package version instead of hash
ed12454 
Use APKINDEX instead of running an alpine container to access apk
@nemchik
Put spaces back
e94caec
@nemchik
Switch to curl, apply to external triggers
a843e52 
and don't pull alpine image in jenkins
@nemchik
Merge branch 'monthly-alpine-package-versions' of github.com:linuxser…
f9522da 
…ver/docker-jenkins-builder into monthly-alpine-package-versions
@nemchik
Fix typo
bab0a20
@nemchik
Extraft APKINDEX to /tmp
d5d1ad7
@aptalca
Merge pull request #93 from linuxserver/monthly-alpine-package-versions
8fa005a 
Get alpine package version instead of hash
@aptalca
rebase to alpine 3.13, update templates
da46544
@aptalca
prepend github releases with branch if not latest
538983f
@aptalca
Merge pull request #90 from linuxserver/monthly-external
741ffc0 
Monthly external
@Roxedus
We out here fancy with dropdowns
26f69a0
@aptalca
Merge pull request #94 from linuxserver/monthly-unraid-fixes
be9ae14 
Unraid fixes
@project-bot project-bot bot added this to PRs & in progress issues in Issue & PR Tracker Feb 10, 2021
@LinuxServer-CI
Copy link
Contributor

I am a bot, here are the test results for this PR:
https://ci-tests.linuxserver.io/lspipepr/jenkins-builder/61a11021-pkg-61a11021-pr-95/index.html
https://ci-tests.linuxserver.io/lspipepr/jenkins-builder/61a11021-pkg-61a11021-pr-95/shellcheck-result.xml

nemchik
nemchik approved these changes Feb 10, 2021
View reviewed changes
Copy link
Member

@nemchik nemchik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Issue & PR Tracker automation moved this from PRs & in progress issues to Team approved, ready for merge Feb 10, 2021
@nemchik nemchik mentioned this pull request Feb 10, 2021
Merged
@nemchik
Copy link
Member

nemchik commented Feb 10, 2021

Commenting here so I don't loose this info in discord history:

https://github.com/linuxserver/docker-openssh-server/blob/master/jenkins-vars.yml
https://github.com/linuxserver/docker-transmission/blob/master/jenkins-vars.yml
https://github.com/linuxserver/docker-nginx/blob/master/jenkins-vars.yml
https://github.com/linuxserver/docker-ngircd/blob/master/jenkins-vars.yml
https://github.com/linuxserver/docker-smokeping/blob/master/jenkins-vars.yml
these can all be switched to external_type: alpine_repo once the monthly merges
most of them should probably have more than just that one line switched (we would want to set them up like mariadb's alpine branch is so the dockerfile uses the version to install)

Bit of a TODO list for me for later.
One done: linuxserver/docker-rsnapshot#4

@aptalca aptalca merged commit 5e5db45 into master Feb 11, 2021
Issue & PR Tracker automation moved this from Team approved, ready for merge to Done Feb 11, 2021
@aptalca aptalca deleted the monthly branch February 11, 2021 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nemchik nemchik nemchik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Issue & PR Tracker
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@aptalca @LinuxServer-CI @nemchik @Roxedus