PyPI - travis2docker - Versions diffs - 6.4.15__tar.gz → 6.4.16__tar.gz - Mend

@@ -306,6 +306,7 @@ class Travis2Docker(object):
                     copies = []
                     for copy_path, dest in self.copy_paths:
                         copies.append((self.copy_path(copy_path), dest))
+                    self.set_authorized_key()
                     kwargs = {
                         'runs': [],
                         'copies': copies,
@@ -381,3 +382,25 @@ class Travis2Docker(object):
         else:
             raise UserWarning("Just directory or file is supported to copy [%s]" % src)
         return os.path.relpath(dest_path, self.curr_work_path)
+    def set_authorized_key(self):
+        ssh_dir = os.path.expanduser("~/.ssh")
+        ed_key = os.path.join(ssh_dir, "id_ed25519.pub")
+        rsa_key = os.path.join(ssh_dir, "id_rsa.pub")
+        to_copy = False
+        if os.path.isfile(ed_key):
+            to_copy = ed_key
+        elif os.path.isfile(rsa_key):
+            print("RSA keys are deprecated, consider changing to ed25519")
+            to_copy = rsa_key
+        if not to_copy:
+            print("No public key found. No key added to ~/.ssh/authorized_keys. SSH login won't work.")
+            return
+        with open(to_copy, "r", encoding="utf-8") as key_fd:
+            pub_key = key_fd.read()
+        with open(os.path.join(self.curr_work_path, ".ssh", "authorized_keys"), "w", encoding="utf-8") as auth_fd:
+            auth_fd.write(pub_key)

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.15
+current_version = 6.4.16
 commit = True
 tag = True

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: travis2docker
-Version: 6.4.15
+Version: 6.4.16
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

@@ -26,7 +26,7 @@ project = u'travis2docker'
 year = '2016'
 author = u'Vauxoo'
 copyright = '{0}, {1}'.format(year, author)
-version = release = u'6.4.15'
+version = release = u'6.4.16'
 pygments_style = 'trac'
 templates_path = ['.']

@@ -15,7 +15,7 @@ def read(*names, **kwargs):
 setup(
     name='travis2docker',
-    version='6.4.15',
+    version='6.4.16',
     license='BSD',
     description='Script to generate Dockerfile from .travis.yml file',
     long_description='%s\n%s'

@@ -94,7 +94,7 @@ def main(return_result=False):
     parser.add_argument(
         '--root-path',
         dest='root_path',
-        help="Root path to save scripts generated." "\nDefault: 'tmp' dir of your O.S.",
+        help=f"Root path to save scripts generated.\nDefault: {default_root_path}",
         default=default_root_path,
     )
     parser.add_argument(

@@ -34,7 +34,6 @@ RUN . /home/odoo/build.sh && \
     configure_vim && \
     configure_zsh && \
     chown_all && \
-    set_authorized_keys && \
     mv /entrypoint_image /deployv_entrypoint_image && \
     mv /entry_point.py /deployv_entry_point.py && \
     mkdir /run/sshd

@@ -55,26 +55,6 @@ EOF
     # alias odoo
 }
-set_authorized_keys(){
-    YELLOW='\033[0;33m'
-    NC='\033[0m'
-    AUTH_FILE="${HOME}/.ssh/authorized_keys"
-    ED_KEY="${HOME}/.ssh/id_ed25519.pub"
-    RSA_KEY="${HOME}/.ssh/id_rsa.pub"
-    echo "INFO: Adding public key to ~/.ssh/authorized_keys"
-    if [ -f "${ED_KEY}" ]; then
-        tee -a "${AUTH_FILE}" < "${ED_KEY}"
-    elif [ -f "${RSA_KEY}" ]; then
-        printf "${YELLOW}WARNING: RSA keys are deprecated, consider changing to ed25519\n${NC}"
-        tee -a "${AUTH_FILE}" < "${RSA_KEY}"
-    else
-        echo "INFO: No public key found. No key added to ~/.ssh/authorized_keys"
-    fi
-}
 # You can add new packages here
 install_dev_tools(){
     apt update -qq

	@@ -0,0 +1 @@
1	+ __version__ = "6.4.16"

	@@ -1 +0,0 @@
1	- __version__ = "6.4.15"

travis2docker 6.4.15__tar.gz → 6.4.16__tar.gz