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
Abstract db access from Postfix and Dovecot #612
Conversation
@kaiyou Did you see the conflict? |
Yes, the conflict can be resolved at merge time and is pretty straightforward :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All seems good 🥇
@kaiyou, I looked to resolving the merge conflict myself, but I'm not comfortable doing it. Especially for the |
I'll resolve it tomorrow then :) |
Merged, if you could have a quick look and see everything still runs fine, especially the tenacity part :) |
core/postfix/Dockerfile
Outdated
@@ -1,7 +1,7 @@ | |||
FROM alpine:3.8 | |||
|
|||
RUN apk add --no-cache postfix postfix-pcre rsyslog \ | |||
python3 py3-pip \ | |||
&& python3 py3-pip \ | |||
&& pip3 install --upgrade pip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need another backslash at the end of this line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
God do I need more coffee.
We might put an expresso machine on the "Donation list": Edit See: I think you are trying to install python3, not running it? So the first |
core/postfix/Dockerfile
Outdated
@@ -2,7 +2,7 @@ FROM alpine:3.8 | |||
|
|||
RUN apk add --no-cache postfix postfix-pcre rsyslog \ | |||
&& python3 py3-pip \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Omit &&
beginning of line
core/postfix/Dockerfile
Outdated
@@ -2,7 +2,7 @@ FROM alpine:3.8 | |||
|
|||
RUN apk add --no-cache postfix postfix-pcre rsyslog \ | |||
&& python3 py3-pip \ | |||
&& pip3 install --upgrade pip \ | |||
pip3 install --upgrade pip \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kaiyou Wrong line, the build fails on line 3 /4. apk add
needs to install python3
and py3-pip
. With the &&
in front, you just try to run python3
which is not installed.
All back to normal again :p. It works fine now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we have a merge \o/
🎉 🎈 🎂 |
This is a work in progress but I guess the review can start already as 90% of it is testable.
Most of the original work is discussed in #420 and #445. The general idea is that
No change should be required in a standard compose environment. There are still a lot of tests to run before declaring this equivalent to the current database queries.