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.

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

Rebase generic off monolithic #133

Merged
merged 6 commits into from
Oct 9, 2021
Merged

Rebase generic off monolithic #133

merged 6 commits into from
Oct 9, 2021

Conversation

VibroAxe
Copy link
Member

This commit rebases the generic code into the monolithic image
This allows the base image to be the more regularly accessed / edited image

Commits to lancachenet/generic:switcheroo will mimic this commit (lancachenet/generic#112)

Also fixes lancachenet/generic#108

This commit rebases the generic code into the monolithic image
This allows the base image to be the more regularly accessed / edited image

Commits to lancachenet/generic:switcheroo will mimic this commit

Also fixes lancachenet/generic#108
Implements lancachenet/generic#93 as this is no longer a valid comit after switcheroo
@VibroAxe
Copy link
Member Author

Testing image available on lancachenet/monolithic:switcheroo

Dockerfile Outdated Show resolved Hide resolved
overlay/etc/nginx/sites-available/10_cache.conf Outdated Show resolved Hide resolved
overlay/etc/nginx/sites-available/cache.conf.d/20_lol.conf Outdated Show resolved Hide resolved
overlay/etc/nginx/stream-available/10_sni.conf Outdated Show resolved Hide resolved
overlay/etc/nginx/sites-available/10_cache.conf Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
@VibroAxe
Copy link
Member Author

VibroAxe commented Oct 8, 2021

This should also add the following PR's from generic:

lancachenet/generic#103
lancachenet/generic#113 - With a <1h life, tbc in the morning
lancachenet/generic#93 - With seperate files

Reminder to self to attribute these contributors in the merge request

VibroAxe and others added 3 commits October 9, 2021 00:11
Ported PR lancachenet/generic#103 from @Crabbey
Changes CACHE_MEM_SIZE to CACHE_INDEX_SIZE but maintains backwards compatiblity through deprecation.sh
This allows us to cache the response in the event a file hasn't been downloaded yet
Set to 2m as a really long time to download a single 1m slice from upstream

Based on thoughts from lancachenet/generic#113
Build generic from monolithic
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cache_test.sh doesn't work
3 participants