Skip to content

Python 3 support #11

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

Closed
wants to merge 2 commits into from
Closed

Python 3 support #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e64668
Python 3 support (refs #10)
jonashaag Sep 7, 2020
c1ae5bd
Python 3 support
jonashaag Sep 7, 2020
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
18 changes: 10 additions & 8 deletions docker_push_ssh/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
import socket
import sys
import time
import urllib2
import httplib

from command import Command
from .command import Command


def getLocalIp():
Expand All @@ -38,12 +36,16 @@ def waitForSshTunnelInit(retries=20, delay=1.0):
for _ in range(retries):
time.sleep(delay)

try:
response = urllib2.urlopen("http://localhost:5000/v2/", timeout=5)
except (socket.error, urllib2.URLError, httplib.BadStatusLine):
continue
sshCheckCommandResult = Command("docker", [
"exec",
"docker-push-ssh-tunnel",
"wget",
"-O", "/dev/null",
"-q",
"http://localhost:5000/v2"
Copy link
Owner

Choose a reason for hiding this comment

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

please add --timeout=5 to the wget args to match the previous behavior

]).environment_dict(os.environ).execute()

if response.getcode() == 200:
if not sshCheckCommandResult.failed():
return True

return False
Expand Down
2 changes: 1 addition & 1 deletion docker_push_ssh/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def environment(self, key, value):
return self

def environment_dict(self, env_dict):
for key, value in env_dict.iteritems():
for key, value in env_dict.items():
self.environment_variables[key] = value
return self

Expand Down