atomicshop 2.11.0__py3-none-any.whl → 2.11.2__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.11.0'
+__version__ = '2.11.2'

atomicshop/addons/mains/install_docker_ubuntu_main_sudo.py

@@ -2,7 +2,8 @@ from atomicshop.wrappers.dockerw import install_docker
 
 
 def main():
-    install_docker.install_docker_ubuntu()
+    install_docker.install_docker_ubuntu(
+        use_docker_installer=True, rootless=False, add_current_user_to_docker_group_bool=True)
 
 
 if __name__ == '__main__':

atomicshop/wrappers/dockerw/install_docker.py

@@ -93,7 +93,9 @@ def install_docker_ubuntu(
         # Use the docker installer script.
         # The script will install docker and add the current user to the docker group.
         # The script will also install docker-compose and docker-buildx.
-        process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh', shell=True)
+        # process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh', shell=True)
+        process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh', shell=True)
+        process.execute_script('sh get-docker.sh', shell=True)
     else:
         # Remove the existing keyrings, so we will not be asked to overwrite it if it exists.
         docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -37,12 +37,16 @@ def install_before_restart(
         print_api("This script requires root privileges...", color='red')
         sys.exit(1)
 
-    docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
+    # Install docker in rootless mode.
+    install_docker.install_docker_ubuntu(
+        use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
+
+    # docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
     nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
     fact_core_pre_install_file_path = str(Path(installation_directory, config_install.PRE_INSTALL_FILE_PATH))
 
     # Remove the existing keyrings, so we will not be asked to overwrite it if it exists.
-    filesystem.remove_file(docker_keyring_file_path)
+    # filesystem.remove_file(docker_keyring_file_path)
     filesystem.remove_file(nodesource_keyring_file_path)
 
     # Remove the existing installation directory.
@@ -76,9 +80,9 @@ def install_before_restart(
 
     # Install docker. FACT installs the docker, but there can be a problem with permissions, so we need to add
     # the user permissions to the docker group before restart.
-    if not install_docker.add_current_user_to_docker_group():
-        print_api("Docker is installed, but the current user was not added to the docker group.", color='red')
-        sys.exit(1)
+    # if not install_docker.add_current_user_to_docker_group():
+    #     print_api("Docker is installed, but the current user was not added to the docker group.", color='red')
+    #     sys.exit(1)
 
     print_api("FACT_core installation before restart is finished.", color='green')
     print_api("Please restart the computer to continue the installation.", color='red')

{atomicshop-2.11.0.dist-info → atomicshop-2.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.11.0
+Version: 2.11.2
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.11.0.dist-info → atomicshop-2.11.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=s2wz8eSBb6qWra33TBucyEy5wBD-UCjN1HUhZ99l0VE,123
+atomicshop/__init__.py,sha256=TSxBMhdcUN68ilX56L8I5fDIdIWDsLDchmH1jrUKuKg,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -49,7 +49,7 @@ atomicshop/addons/PlayWrightCodegen.cmd,sha256=Z5cnllsyXD4F1W2h-WLEnyFkg5nZy0-hT
 atomicshop/addons/ScriptExecution.cmd,sha256=8iC-uHs9MX9qUD_C2M7n9Xw4MZvwOfxT8H5v3hluVps,93
 atomicshop/addons/a_setup_scripts/install_psycopg2_ubuntu.sh,sha256=lM7LkXQ2AxfFzDGyzSOfIS_zpg9bAD1k3JJ-qu5CdH8,81
 atomicshop/addons/a_setup_scripts/install_pywintrace_0.3.cmd,sha256=lEP_o6rWcBFUyup6_c-LTL3Q2LRMqryLuG3mJw080Zc,115
-atomicshop/addons/mains/install_docker_ubuntu_main_sudo.py,sha256=3VDGDO41Vubzf64DaBapLlFYX52dEdyPBNfolSsbGcM,161
+atomicshop/addons/mains/install_docker_ubuntu_main_sudo.py,sha256=MZy2DQXRndjCSiZEXweDiSbZtsY9WmDyuxOdKUO8TK8,256
 atomicshop/addons/mains/install_wsl_ubuntu_lts_admin.py,sha256=PrvZ4hMuadzj2GYKRZSwyNayJUuaSnCF9nV6ORqoPdo,123
 atomicshop/addons/mains/msi_unpacker.py,sha256=XAJdEqs-3s9JqIgHpGRL-HxLKpFMXdrlXmq2Is2Pyfk,164
 atomicshop/addons/mains/search_for_hyperlinks_in_docx.py,sha256=HkIdo_Sz9nPbbbJf1mwfwFkyI7vkvpH8qiIkuYopN4w,529
@@ -164,7 +164,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=eyF
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=ajiFiLXl1prg2kOhatfT8E2RKX7F8JjUJpwkVuKu1GY,16263
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/dockerw/dockerw.py,sha256=w8zSJr5C7cbvbuG09ORCpAe0BOcibqqL_Z2EKEBHYK4,6266
-atomicshop/wrappers/dockerw/install_docker.py,sha256=QNKLgm_UVpwN63D8v8k8FhOyEwA9XjHi0CT5f1FfEhA,6846
+atomicshop/wrappers/dockerw/install_docker.py,sha256=0HtFRPawTgWnWBHmc_sHCKZYMS8tIQ41IkjwpiFX3-E,7010
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elasticsearchw.py,sha256=7TqFdEFznO8NlligJhEKk1vm641ALpCYdaRl1uoXdzM,9768
@@ -187,7 +187,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=jJAoJNQ4aoATjn3x
 atomicshop/wrappers/factw/fact_extractor/get_extractor.py,sha256=2mfOAftHIlCcGt1s7MWdq7DsDCuI6wX3MtvcEZ4SK-0,756
 atomicshop/wrappers/factw/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/install/install_after_restart.py,sha256=-VXC3KDX2BzF0oi0ELCmfch55vLk-3t16KxlmYyUGD8,1560
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=7Yk1xZXFXoPZVsSvgZzOLMoZza9OFIB5HplLQxY-7Bs,4251
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=nJEJbmSICktNoDoNLfhbMj4Vr4eY7CtR80RfJvbEM68,4442
 atomicshop/wrappers/factw/postgresql/__init__.py,sha256=xMBn2d3Exo23IPP2F_9-SXmOlhFbwWDgS9KwozSTjA0,162
 atomicshop/wrappers/factw/postgresql/analysis.py,sha256=2Rxzy2jyq3zEKIo53z8VkjuslKE_i5mq2ZpmJAvyd6U,716
 atomicshop/wrappers/factw/postgresql/file_object.py,sha256=VRiCXnsd6yDbnsE-TEKYPC-gkAgFVkE6rygRrJLQShI,713
@@ -242,8 +242,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.11.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.0.dist-info/METADATA,sha256=4qiSE0G-IMCVID80QijXfSjtq7_eJvhsvkINwCxNGjA,10447
-atomicshop-2.11.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.0.dist-info/RECORD,,
+atomicshop-2.11.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.2.dist-info/METADATA,sha256=cl2xw9ISoDFgfgjyFNHPO6V_wgqC8kzQ9WikexNee50,10447
+atomicshop-2.11.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.2.dist-info/RECORD,,