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

fix: re-enable change user and fix SIGTERM #2882

Merged
merged 2 commits into from
Jan 11, 2024

Conversation

hay-kot
Copy link
Collaborator

@hay-kot hay-kot commented Dec 28, 2023

What type of PR is this?

(REQUIRED)

  • bug

What this PR does / why we need it:

(REQUIRED)

  • Revert a commented out function I did in a PR (and fixes command)
  • Fixes SIGTERM listen (verified locally)

Which issue(s) this PR fixes:

(REQUIRED)

Closes #2845
Closes #2723
Closes #2411 (probably)

Special notes for your reviewer:

(fill-in or delete this section)

Testing

(fill-in or delete this section)

michael-genson
michael-genson previously approved these changes Dec 28, 2023
@hay-kot hay-kot force-pushed the fix/revert-disable-change-user branch from f9426ef to ae95820 Compare January 11, 2024 22:45
@hay-kot hay-kot changed the title re-enable change user fix: re-enable change user and fix SIGTERM Jan 11, 2024
@hay-kot hay-kot marked this pull request as ready for review January 11, 2024 22:46
@@ -138,4 +138,4 @@ EXPOSE ${APP_PORT}
COPY ./docker/entry.sh $MEALIE_HOME/run.sh

RUN chmod +x $MEALIE_HOME/run.sh
ENTRYPOINT $MEALIE_HOME/run.sh
ENTRYPOINT ["/app/run.sh"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This had to be switched to the JSON type format because of the way docker handles the starting of the container scripts which also doesn't allow us to use env variables in the string, so that's neat!

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hah, lovely

@michael-genson
Copy link
Collaborator

LGTM. I'll leave it for you to merge

@hay-kot hay-kot merged commit 58df50f into mealie-next Jan 11, 2024
9 checks passed
@hay-kot hay-kot deleted the fix/revert-disable-change-user branch January 11, 2024 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants