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

Fixing the Dockerfile #522

Merged
merged 17 commits into from
Nov 13, 2020
Merged

Fixing the Dockerfile #522

merged 17 commits into from
Nov 13, 2020

Conversation

glaslos
Copy link
Member

@glaslos glaslos commented Nov 3, 2020

The container builds but there are issues when running it. Would appreciate someone to have a look at it as well.
Justification for dropping Alpine as base container: https://pythonspeed.com/articles/alpine-docker-python/

@coveralls
Copy link

coveralls commented Nov 3, 2020

Pull Request Test Coverage Report for Build 1279

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 15 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+0.2%) to 73.619%

Files with Coverage Reduction New Missed Lines %
conpot/protocols/ftp/ftp_handler.py 5 82.46%
conpot/protocols/ftp/ftp_base_handler.py 10 80.92%
Totals Coverage Status
Change from base Build 1275: 0.2%
Covered Lines: 5545
Relevant Lines: 7532

💛 - Coveralls

@glaslos glaslos changed the title attempting to fix the dockerfile Fixing the Dockerfile Nov 4, 2020
Copy link
Contributor

@srenfo srenfo left a comment

Choose a reason for hiding this comment

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

Works on my machine. 👍

Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
glaslos and others added 3 commits November 4, 2020 20:35
Co-authored-by: srenfo <14216995+srenfo@users.noreply.github.com>
Co-authored-by: srenfo <14216995+srenfo@users.noreply.github.com>
Co-authored-by: srenfo <14216995+srenfo@users.noreply.github.com>
@glaslos glaslos marked this pull request as ready for review November 4, 2020 19:44
conpot/emulators/proxy.py Outdated Show resolved Hide resolved
Co-authored-by: srenfo <14216995+srenfo@users.noreply.github.com>
@srenfo
Copy link
Contributor

srenfo commented Nov 10, 2020

FYI there is #491 for the failing coveralls checks.

@glaslos
Copy link
Member Author

glaslos commented Nov 10, 2020

Yeah, annoying that I have to add a test somewhere just to make coveralls happy... Maybe we should give another tool a try 🤔

@srenfo
Copy link
Contributor

srenfo commented Nov 10, 2020

Yeah, annoying that I have to add a test somewhere just to make coveralls happy... Maybe we should give another tool a try thinking

I think it's a false positive. I don't see your changes in this PR impacting the coverage.

I suspect it's comparing the wrong things... maybe coverage across runs from different branches?

Makefile Show resolved Hide resolved
Dockerfile Outdated Show resolved Hide resolved
@glaslos
Copy link
Member Author

glaslos commented Nov 13, 2020

@srenfo good to merge?

@srenfo
Copy link
Contributor

srenfo commented Nov 13, 2020

@srenfo good to merge?

It just now successfully built and ran on my machine. 🥇

I don't have a merge button, so please go ahead. 😄

@glaslos glaslos merged commit 68702a4 into master Nov 13, 2020
@glaslos glaslos deleted the fixed_dockerfile branch November 13, 2020 16:00
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.

4 participants