Switch from supervisord to s6-overlay #293
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Difegue
requested changes
May 7, 2020
koma-cute
added a commit
to koma-cute/LANraragi
that referenced
this pull request
May 7, 2020
Should be inline with dev now, I think I solved the conflicts correctly. |
koma-cute
added a commit
to koma-cute/LANraragi
that referenced
this pull request
May 7, 2020
koma-cute
force-pushed
the
supervisord-swap
branch
from
e378ca8
to
26f0333
Compare
|
merge commits are fucked, I rebased like I should have to begin with |
|
The tests are failing rn due to the nightly build being super fucked, things should go back to normal whenever actions are done rebuilding a full nightly image. |
Difegue
requested changes
May 8, 2020
changing anything in tools folder causes whole build to retrigger, avoid that
previous removed in install-everything.sh
it gets excluded by the dockerignore file otherwise, and the copy technically happens in the docker layer, so
redis tells us this on startup itself
we make extensive use of envvars in lrr and the setup scripts there shouldn't be anything sensitive, so pass them to all processes with this, rather than restrictively using `with-contenv`
koma-cute
force-pushed
the
supervisord-swap
branch
from
de8bdf6
to
7f6ac38
Compare
|
Rebased, should be inline. |
|
You forgot to re-add the install script to the COPY line, so it breaks the build. |
|
So I did, duh. Fixed now. |
Difegue
requested changes
May 9, 2020
|
|
|
Huh, interesting. My docker images were still around 150MB. Were there other optimizations to reduce it that much more? No problem, glad to help! |
|
This is the compressed size, so unpacked it'll still be around 150, same as the Docker images. |
|
Ah, gotcha. Thought that's what the |
Difegue
added a commit
that referenced
this pull request
May 20, 2020
* initial s6 transition * move install-everything.sh to Dockerfile changing anything in tools folder causes whole build to retrigger, avoid that * add .dockerignore excluding documentation previous removed in install-everything.sh * move wsl.conf to docker folder it gets excluded by the dockerignore file otherwise, and the copy technically happens in the docker layer, so * remove redis overcommit_memory messages redis tells us this on startup itself * set S6_KEEP_ENV we make extensive use of envvars in lrr and the setup scripts there shouldn't be anything sensitive, so pass them to all processes with this, rather than restrictively using `with-contenv` * set uid and gid for services * terminate lrr also if the service fails * set s6 stage 2 fail early and kill time opts * remove manual inotify2 call #293 (comment) * revert install-everything.sh consolidation * remove chmod +x and set exec directly on file * fix old comment * add install-everything.sh to tools * Update tools/build/docker/s6/services.d/redis/run Co-authored-by: Difegue <[email protected]> * readd redis OVERCOMMIT warning * move redis.conf back to tools/build/docker Co-authored-by: koma-cute <[email protected]> Co-authored-by: koma-cute <[email protected]> Co-authored-by: Difegue <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pulling in all of Python just for supervisord is pretty heavy, so we're using s6-overlay to manage running lrr and redis instead.
fix-attrs.disn't used right now since it doesn't have the exact granular control that the previousentrypoint.shscript did (chowning some stuff's user recursively, but not the mode). The file is there for now, but not copied into the docker image.