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

Merge latest upstream fixes #2

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Merge latest upstream fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c136cae
Fix docker build failure due to missing pip3
Apr 10, 2021
1d8c2bb
Fixes for latest alpine. pip3 must have been included with python3 b…
Apr 11, 2021
4978721
Fix runtime failure with latest aiosmptd version; controller argument…
Apr 11, 2021
f24962f
Merge pull request #8 from l3nticular/bugfix/build_failure_pip3
wicol Jun 24, 2021
8eefa11
intify the port
wicol Jun 24, 2021
ff2d24b
black
wicol Jun 24, 2021
5dcf4f7
Merge remote-tracking branch 'wicol/master'
Sep 4, 2021
b0d8c0d
Merge pull request #1 of https://github.com/vfilby/emqtt
Sep 4, 2021
65a2819
Re-order Dockerfile so that `apk add` doesn't run as often
Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM alpine:latest
WORKDIR /emqtt
COPY runner.py requirements.txt ./
COPY requirements.txt ./
RUN apk add --no-cache python3 py3-pip && pip3 install -r requirements.txt
COPY runner.py ./
COPY emqtt ./emqtt
COPY tests ./tests
RUN apk add --no-cache python3 && pip3 install -r requirements.txt
EXPOSE 1025
CMD ["python3", "runner.py"]
8 changes: 4 additions & 4 deletions runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@

loop = asyncio.get_event_loop()
c = Controller(
emqtt.EMQTTHandler(loop, config),
loop,
config['SMTP_LISTEN_ADDRESS'],
config['SMTP_PORT']
handler=emqtt.EMQTTHandler(loop, config),
loop=loop,
hostname=config['SMTP_LISTEN_ADDRESS'],
port=config['SMTP_PORT']
)

c.start()
Expand Down