atomicshop 2.11.30__py3-none-any.whl → 2.11.32__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.30'
+__version__ = '2.11.32'

atomicshop/wrappers/dockerw/install_docker.py

@@ -173,6 +173,12 @@ def install_docker_ubuntu(
         with permissions.temporary_regular_permissions():
             ubuntu_terminal.add_path_to_bashrc(as_regular_user=True)
 
+        # Add appropriate permissions to the docker socket, so the user can run docker commands without sudo in python.
+        # process.execute_script('export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock', shell=True)
+        process.execute_script('export DOCKER_HOST=unix:///run/user/1000/docker.sock', shell=True)
+        # Restart shell.
+        process.execute_script('source ~/.bashrc', shell=True)
+
     if add_current_user_to_docker_group_bool:
         # Check if current user that executed the script is a sudo user. If not, use the current user.
         # Add the current user to the docker group.

atomicshop/wrappers/factw/fact_extractor/docker_image.py

@@ -66,10 +66,10 @@ def create_docker_image_ubuntu(directory_path: str):
     cd fact_extractor
 
     # Start docker service.
-    sudo service docker start
+    # sudo service docker start
 
     # Build the Docker image
-    sudo docker build -t fact_extractor .
+    docker build -t fact_extractor .
     """
 
     # Execute the script.

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -5,6 +5,7 @@ from .... import permissions, filesystem
 from ....archiver import zips
 from ....print_api import print_api
 from ... import githubw, pipw, ubuntu_terminal
+from ...dockerw import install_docker
 from .. import config_install
 
 
@@ -88,9 +89,14 @@ def install_before_restart(
 
         ubuntu_terminal.update_system_packages()
         ubuntu_terminal.install_packages(['python3-pip', 'git', 'libffi-dev', 'lsb-release'])
+
+        prerequisites_file_path = str(Path(installation_directory, config_install.PRE_INSTALL_PREREQUISITES_FILE_PATH))
         pipw.install_packages_with_current_interpreter(
             prefer_binary=True,
-            requirements_file_path=config_install.PRE_INSTALL_PREREQUISITES_FILE_PATH)
+            requirements_file_path=prerequisites_file_path)
+
+        install_docker.install_docker_ubuntu(
+            use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
 
     # 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.

{atomicshop-2.11.30.dist-info → atomicshop-2.11.32.dist-info}/METADATA

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

{atomicshop-2.11.30.dist-info → atomicshop-2.11.32.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=0yKixDn2ebzNbUhatDcnc-bep-dodkvVk_4xKZbeF_8,124
+atomicshop/__init__.py,sha256=KVdm-OdRa3eg-hrRk4P9g-vvJdV28OXyYH4UeADQ3L4,124
 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
@@ -165,7 +165,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=VAr5AB08lglsILBTnm0m2sMTcTFMCNZplfFFPVa2R2Q,8909
+atomicshop/wrappers/dockerw/install_docker.py,sha256=ez4xffAszl_TTNprVCylLO9SnNp5c3JZg9ulZO7CrcE,9326
 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
@@ -184,11 +184,11 @@ atomicshop/wrappers/factw/config_fact.py,sha256=J-K9Zn50WcDC7ubb-boraSZExfBk7a6M
 atomicshop/wrappers/factw/config_install.py,sha256=N-6Fg4Z_aG33r0WGlYgBQTFnamJceYyW4XjnGyyNAks,555
 atomicshop/wrappers/factw/get_file_data.py,sha256=ChKC0OjgjFlNubZQBwcGhRO3L2pccc27RLRlAMIUix4,1641
 atomicshop/wrappers/factw/fact_extractor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=jJAoJNQ4aoATjn3x_va031Obb4oBtcqCY40hydghm0s,2504
+atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=2FyYjnw8gxFNwISQ83OwH-iGivkFi6EAluyCZ0loHEQ,2501
 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=YhFqqwS_jtgksg7U-4SzegMZayrblxVdsavm7Myx3r4,5340
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=vI0ZPSvGQOTKDBgxqbOfW9HGIDexnyAR0cUUCdFgmuQ,5624
 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
@@ -243,8 +243,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.30.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.30.dist-info/METADATA,sha256=tkLSN2TVqMjpjvq0hp2JNJSkdSetzDxkF7wK4eeMoe0,10448
-atomicshop-2.11.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.30.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.30.dist-info/RECORD,,
+atomicshop-2.11.32.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.32.dist-info/METADATA,sha256=L9sbxCDrgqVwqyqqqleGWkNdCM8IyWZMOzVzKBgAujE,10448
+atomicshop-2.11.32.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.32.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.32.dist-info/RECORD,,