docker improvements

kizniche · Dec 7, 2021 · bd38694 · bd38694
1 parent 55859e2
commit bd38694
Show file tree

Hide file tree

Showing 93 changed files with 214 additions and 128 deletions.
diff --git a/databases/__init__.py → alembic_db/__init__.py b/databases/__init__.py → alembic_db/__init__.py
diff --git a/databases/alembic.ini → alembic_db/alembic.ini b/databases/alembic.ini → alembic_db/alembic.ini
@@ -29,8 +29,7 @@ script_location = alembic
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = sqlite:///mycodo.db
-
+sqlalchemy.url = sqlite:///../databases/mycodo.db
 
 # Logging configuration
 [loggers]

diff --git a/databases/alembic/README → alembic_db/alembic/README b/databases/alembic/README → alembic_db/alembic/README
diff --git a/databases/alembic/env.py → alembic_db/alembic/env.py b/databases/alembic/env.py → alembic_db/alembic/env.py
diff --git a/databases/alembic/script.py.mako → alembic_db/alembic/script.py.mako b/databases/alembic/script.py.mako → alembic_db/alembic/script.py.mako
@@ -10,7 +10,7 @@ import os
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 from alembic import op
 import sqlalchemy as sa

diff --git a/...22dc4b_add_camera_file_tracking_fields.py → ...22dc4b_add_camera_file_tracking_fields.py b/...22dc4b_add_camera_file_tracking_fields.py → ...22dc4b_add_camera_file_tracking_fields.py
diff --git a/...c_add_location_backlight_column_to_lcd.py → ...c_add_location_backlight_column_to_lcd.py b/...c_add_location_backlight_column_to_lcd.py → ...c_add_location_backlight_column_to_lcd.py
diff --git a/...dd_output_option_trigger_functions_at_.py → ...dd_output_option_trigger_functions_at_.py b/...dd_output_option_trigger_functions_at_.py → ...dd_output_option_trigger_functions_at_.py
diff --git a/...lit_ds18b20_input_module_for_separate_.py → ...lit_ds18b20_input_module_for_separate_.py b/...lit_ds18b20_input_module_for_separate_.py → ...lit_ds18b20_input_module_for_separate_.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  pass

diff --git a/...sions/0bd51c536217_add_action_ramp_pwm.py → ...sions/0bd51c536217_add_action_ramp_pwm.py b/...sions/0bd51c536217_add_action_ramp_pwm.py → ...sions/0bd51c536217_add_action_ramp_pwm.py
diff --git a/...e53d526f13_rename_measure_to_condition.py → ...e53d526f13_rename_measure_to_condition.py b/...e53d526f13_rename_measure_to_condition.py → ...e53d526f13_rename_measure_to_condition.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("input") as batch_op:

diff --git a/...0e150fb8020b_add_multi_channel_outputs.py → ...0e150fb8020b_add_multi_channel_outputs.py b/...0e150fb8020b_add_multi_channel_outputs.py → ...0e150fb8020b_add_multi_channel_outputs.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  op.create_table(

diff --git a/...s/110d2d00e91d_remove_conversion_entry.py → ...s/110d2d00e91d_remove_conversion_entry.py b/...s/110d2d00e91d_remove_conversion_entry.py → ...s/110d2d00e91d_remove_conversion_entry.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
 def downgrade():

diff --git a/...ions/1cf1cd4d06bd_add_cascaded_methods.py → ...ions/1cf1cd4d06bd_add_cascaded_methods.py b/...ions/1cf1cd4d06bd_add_cascaded_methods.py → ...ions/1cf1cd4d06bd_add_cascaded_methods.py
diff --git a/...rsions/20174b717c2e_add_widget_options.py → ...rsions/20174b717c2e_add_widget_options.py b/...rsions/20174b717c2e_add_widget_options.py → ...rsions/20174b717c2e_add_widget_options.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("widget") as batch_op:

diff --git a/...ons/211cd8cc576b_add_camera_option_fps.py → ...ons/211cd8cc576b_add_camera_option_fps.py b/...ons/211cd8cc576b_add_camera_option_fps.py → ...ons/211cd8cc576b_add_camera_option_fps.py
diff --git a/...ons/24dbd0b8c8d1_add_function_channels.py → ...ons/24dbd0b8c8d1_add_function_channels.py b/...ons/24dbd0b8c8d1_add_function_channels.py → ...ons/24dbd0b8c8d1_add_function_channels.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  op.create_table(

diff --git a/..._add_log_level_debug_to_function_table.py → ..._add_log_level_debug_to_function_table.py b/..._add_log_level_debug_to_function_table.py → ..._add_log_level_debug_to_function_table.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("function") as batch_op:

diff --git a/...ab_add_infrared_remote_trigger_options.py → ...ab_add_infrared_remote_trigger_options.py b/...ab_add_infrared_remote_trigger_options.py → ...ab_add_infrared_remote_trigger_options.py
diff --git a/...s/2976b41930ad_change_lcd_16x4_to_20x4.py → ...s/2976b41930ad_change_lcd_16x4_to_20x4.py b/...s/2976b41930ad_change_lcd_16x4_to_20x4.py → ...s/2976b41930ad_change_lcd_16x4_to_20x4.py
diff --git a/...s/2c3b61fdb239_add_rpyc_timeout_option.py → ...s/2c3b61fdb239_add_rpyc_timeout_option.py b/...s/2c3b61fdb239_add_rpyc_timeout_option.py → ...s/2c3b61fdb239_add_rpyc_timeout_option.py
diff --git a/...1b_add_daemon_debug_mode_config_option.py → ...1b_add_daemon_debug_mode_config_option.py b/...1b_add_daemon_debug_mode_config_option.py → ...1b_add_daemon_debug_mode_config_option.py
@@ -12,7 +12,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 from alembic import op
 import sqlalchemy as sa

diff --git a/...date_user_for_command_function_actions.py → ...date_user_for_command_function_actions.py b/...date_user_for_command_function_actions.py → ...date_user_for_command_function_actions.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
 

diff --git a/..._add_conditional_status_to_conditional.py → ..._add_conditional_status_to_conditional.py b/..._add_conditional_status_to_conditional.py → ..._add_conditional_status_to_conditional.py
diff --git a/...rsions/43c72773dbe8_add_dashboard_lock.py → ...rsions/43c72773dbe8_add_dashboard_lock.py b/...rsions/43c72773dbe8_add_dashboard_lock.py → ...rsions/43c72773dbe8_add_dashboard_lock.py
@@ -10,7 +10,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 from alembic import op
 import sqlalchemy as sa

diff --git a/...440d382bfaa6_add_more_picamera_options.py → ...440d382bfaa6_add_more_picamera_options.py b/...440d382bfaa6_add_more_picamera_options.py → ...440d382bfaa6_add_more_picamera_options.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("camera") as batch_op:

diff --git a/...5ab26ca82_add_conditional_pyro_timeout.py → ...5ab26ca82_add_conditional_pyro_timeout.py b/...5ab26ca82_add_conditional_pyro_timeout.py → ...5ab26ca82_add_conditional_pyro_timeout.py
diff --git a/...c/versions/490e89f108b3_add_login_code.py → ...c/versions/490e89f108b3_add_login_code.py b/...c/versions/490e89f108b3_add_login_code.py → ...c/versions/490e89f108b3_add_login_code.py
diff --git a/...rsions/4b5f6207cbdf_add_camera_options.py → ...rsions/4b5f6207cbdf_add_camera_options.py b/...rsions/4b5f6207cbdf_add_camera_options.py → ...rsions/4b5f6207cbdf_add_camera_options.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("camera") as batch_op:

diff --git a/...s/4b619edb9a8f_add_more_camera_options.py → ...s/4b619edb9a8f_add_more_camera_options.py b/...s/4b619edb9a8f_add_more_camera_options.py → ...s/4b619edb9a8f_add_more_camera_options.py
@@ -19,7 +19,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("camera") as batch_op:

diff --git a/...c/versions/4d3258ef5864_fix_pump_units.py → ...c/versions/4d3258ef5864_fix_pump_units.py b/...c/versions/4d3258ef5864_fix_pump_units.py → ...c/versions/4d3258ef5864_fix_pump_units.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
 

diff --git a/...4ea0a59dee2b_add_lcd_interface_options.py → ...4ea0a59dee2b_add_lcd_interface_options.py b/...4ea0a59dee2b_add_lcd_interface_options.py → ...4ea0a59dee2b_add_lcd_interface_options.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("lcd") as batch_op:

diff --git a/.../4fedeb57e75b_add_function_sample_rate.py → .../4fedeb57e75b_add_function_sample_rate.py b/.../4fedeb57e75b_add_function_sample_rate.py → .../4fedeb57e75b_add_function_sample_rate.py
diff --git a/...0a4e41e7444_add_rescale_method_options.py → ...0a4e41e7444_add_rescale_method_options.py b/...0a4e41e7444_add_rescale_method_options.py → ...0a4e41e7444_add_rescale_method_options.py
diff --git a/...5744b31813_add_conditional_data_schema.py → ...5744b31813_add_conditional_data_schema.py b/...5744b31813_add_conditional_data_schema.py → ...5744b31813_add_conditional_data_schema.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("conditional_data") as batch_op:

diff --git a/...62_add_options_for_multiple_dashboards.py → ...62_add_options_for_multiple_dashboards.py b/...62_add_options_for_multiple_dashboards.py → ...62_add_options_for_multiple_dashboards.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  op.create_table(

diff --git a/...add_missing_output_device_measurements.py → ...add_missing_output_device_measurements.py b/...add_missing_output_device_measurements.py → ...add_missing_output_device_measurements.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
 

diff --git a/...1e8_add_ftdi_support_for_atlas_sensors.py → ...1e8_add_ftdi_support_for_atlas_sensors.py b/...1e8_add_ftdi_support_for_atlas_sensors.py → ...1e8_add_ftdi_support_for_atlas_sensors.py
diff --git a/...568d24_add_password_reset_capabilities.py → ...568d24_add_password_reset_capabilities.py b/...568d24_add_password_reset_capabilities.py → ...568d24_add_password_reset_capabilities.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("users") as batch_op:

diff --git a/...b3d_add_log_level_debug_to_lcd_options.py → ...b3d_add_log_level_debug_to_lcd_options.py b/...b3d_add_log_level_debug_to_lcd_options.py → ...b3d_add_log_level_debug_to_lcd_options.py
diff --git a/...a3a9_refactor_python_execution_systems.py → ...a3a9_refactor_python_execution_systems.py b/...a3a9_refactor_python_execution_systems.py → ...a3a9_refactor_python_execution_systems.py
@@ -11,7 +11,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 
 # revision identifiers, used by Alembic.

diff --git a/...c/versions/66e27f22b15a_add_lcd_cs_pin.py → ...c/versions/66e27f22b15a_add_lcd_cs_pin.py b/...c/versions/66e27f22b15a_add_lcd_cs_pin.py → ...c/versions/66e27f22b15a_add_lcd_cs_pin.py
diff --git a/...ns/69960a0722a7_rename_dashboard_table.py → ...ns/69960a0722a7_rename_dashboard_table.py b/...ns/69960a0722a7_rename_dashboard_table.py → ...ns/69960a0722a7_rename_dashboard_table.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  op.rename_table('dashboard', 'widget')

diff --git a/...e8fec_fix_atlas_ec_sensor_new_channels.py → ...e8fec_fix_atlas_ec_sensor_new_channels.py b/...e8fec_fix_atlas_ec_sensor_new_channels.py → ...e8fec_fix_atlas_ec_sensor_new_channels.py
@@ -10,7 +10,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 from alembic import op
 import sqlalchemy as sa

diff --git a/..._add_custom_options_to_function_tables.py → ..._add_custom_options_to_function_tables.py b/..._add_custom_options_to_function_tables.py → ..._add_custom_options_to_function_tables.py
diff --git a/...update_conditional_statements_for_new_.py → ...update_conditional_statements_for_new_.py b/...update_conditional_statements_for_new_.py → ...update_conditional_statements_for_new_.py
@@ -11,7 +11,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 
 # revision identifiers, used by Alembic.

diff --git a/...b86a98efe_add_index_page_to_user_table.py → ...b86a98efe_add_index_page_to_user_table.py b/...b86a98efe_add_index_page_to_user_table.py → ...b86a98efe_add_index_page_to_user_table.py
diff --git a/...ons/7a9b3cea5c06_add_pin_reset_for_lcd.py → ...ons/7a9b3cea5c06_add_pin_reset_for_lcd.py b/...ons/7a9b3cea5c06_add_pin_reset_for_lcd.py → ...ons/7a9b3cea5c06_add_pin_reset_for_lcd.py
diff --git a/...3f644d_add_dashboard_placement_columns.py → ...3f644d_add_dashboard_placement_columns.py b/...3f644d_add_dashboard_placement_columns.py → ...3f644d_add_dashboard_placement_columns.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("dashboard") as batch_op:

diff --git a/...802cc65f734e_ensure_pyro5_is_installed.py → ...802cc65f734e_ensure_pyro5_is_installed.py b/...802cc65f734e_ensure_pyro5_is_installed.py → ...802cc65f734e_ensure_pyro5_is_installed.py
@@ -18,7 +18,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
 

diff --git a/...ersions/82ee046fbf9b_add_invert_option.py → ...ersions/82ee046fbf9b_add_invert_option.py b/...ersions/82ee046fbf9b_add_invert_option.py → ...ersions/82ee046fbf9b_add_invert_option.py
diff --git a/...840c4d18e38c_add_output_custom_options.py → ...840c4d18e38c_add_output_custom_options.py b/...840c4d18e38c_add_output_custom_options.py → ...840c4d18e38c_add_output_custom_options.py
diff --git a/...ce_add_pid_setpoint_tracking_and_copy_.py → ...ce_add_pid_setpoint_tracking_and_copy_.py b/...ce_add_pid_setpoint_tracking_and_copy_.py → ...ce_add_pid_setpoint_tracking_and_copy_.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("pid") as batch_op:

diff --git a/...a8351ad7a_add_math_option_order_of_use.py → ...a8351ad7a_add_math_option_order_of_use.py b/...a8351ad7a_add_math_option_order_of_use.py → ...a8351ad7a_add_math_option_order_of_use.py
diff --git a/...8f9bf3fe5ec2_add_api_key_to_user_table.py → ...8f9bf3fe5ec2_add_api_key_to_user_table.py b/...8f9bf3fe5ec2_add_api_key_to_user_table.py → ...8f9bf3fe5ec2_add_api_key_to_user_table.py
diff --git a/...c/versions/90wvmtnznxb8_version_7_base.py → ...c/versions/90wvmtnznxb8_version_7_base.py b/...c/versions/90wvmtnznxb8_version_7_base.py → ...c/versions/90wvmtnznxb8_version_7_base.py
diff --git a/...315ec212_add_output_option_output_mode.py → ...315ec212_add_output_option_output_mode.py b/...315ec212_add_output_option_output_mode.py → ...315ec212_add_output_option_output_mode.py
diff --git a/...add_line_text_to_lcd_table_and_delete_.py → ...add_line_text_to_lcd_table_and_delete_.py b/...add_line_text_to_lcd_table_and_delete_.py → ...add_line_text_to_lcd_table_and_delete_.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("lcd_data") as batch_op:

diff --git a/...ec4e059470_add_table_custom_controller.py → ...ec4e059470_add_table_custom_controller.py b/...ec4e059470_add_table_custom_controller.py → ...ec4e059470_add_table_custom_controller.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  op.create_table(

diff --git a/...ns/a8341ac0d779_add_energy_usage_table.py → ...ns/a8341ac0d779_add_energy_usage_table.py b/...ns/a8341ac0d779_add_energy_usage_table.py → ...ns/a8341ac0d779_add_energy_usage_table.py
diff --git a/...91e6a71028f_add_stops_to_gauge_widgets.py → ...91e6a71028f_add_stops_to_gauge_widgets.py b/...91e6a71028f_add_stops_to_gauge_widgets.py → ...91e6a71028f_add_stops_to_gauge_widgets.py
diff --git a/...ns/af5891792291_add_new_output_options.py → ...ns/af5891792291_add_new_output_options.py b/...ns/af5891792291_add_new_output_options.py → ...ns/af5891792291_add_new_output_options.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("function_actions") as batch_op:

diff --git a/...d_logging_debug_option_to_inputs_math_.py → ...d_logging_debug_option_to_inputs_math_.py b/...d_logging_debug_option_to_inputs_math_.py → ...d_logging_debug_option_to_inputs_math_.py
diff --git a/...0_set_default_library_for_ds18b20_and_.py → ...0_set_default_library_for_ds18b20_and_.py b/...0_set_default_library_for_ds18b20_and_.py → ...0_set_default_library_for_ds18b20_and_.py
@@ -11,7 +11,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 
 # revision identifiers, used by Alembic.

diff --git a/...ange_start_stop_state_from_bool_to_str.py → ...ange_start_stop_state_from_bool_to_str.py b/...ange_start_stop_state_from_bool_to_str.py → ...ange_start_stop_state_from_bool_to_str.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("output") as batch_op:

diff --git a/...ff72b5c2c9_add_position_to_input_table.py → ...ff72b5c2c9_add_position_to_input_table.py b/...ff72b5c2c9_add_position_to_input_table.py → ...ff72b5c2c9_add_position_to_input_table.py
diff --git a/...03b708ac6_add_position_to_output_table.py → ...03b708ac6_add_position_to_output_table.py b/...03b708ac6_add_position_to_output_table.py → ...03b708ac6_add_position_to_output_table.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("output") as batch_op:

diff --git a/...rsions/c1cb0775f7ce_add_widget_options.py → ...rsions/c1cb0775f7ce_add_widget_options.py b/...rsions/c1cb0775f7ce_add_widget_options.py → ...rsions/c1cb0775f7ce_add_widget_options.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("dashboard") as batch_op:

diff --git a/...f50eb4f236_add_output_log_level_option.py → ...f50eb4f236_add_output_log_level_option.py b/...f50eb4f236_add_output_log_level_option.py → ...f50eb4f236_add_output_log_level_option.py
diff --git a/...cc7261a89a87_add_input_channel_options.py → ...cc7261a89a87_add_input_channel_options.py b/...cc7261a89a87_add_input_channel_options.py → ...cc7261a89a87_add_input_channel_options.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  op.create_table(

diff --git a/...e17c6e8d_add_custom_actions_to_actions.py → ...e17c6e8d_add_custom_actions_to_actions.py b/...e17c6e8d_add_custom_actions_to_actions.py → ...e17c6e8d_add_custom_actions_to_actions.py
diff --git a/...48_add_pid_option_send_negative_amount.py → ...48_add_pid_option_send_negative_amount.py b/...48_add_pid_option_send_negative_amount.py → ...48_add_pid_option_send_negative_amount.py
diff --git a/...3093e8e_add_python_code_widget_options.py → ...3093e8e_add_python_code_widget_options.py b/...3093e8e_add_python_code_widget_options.py → ...3093e8e_add_python_code_widget_options.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("widget") as batch_op:

diff --git a/..._add_white_balance_options_to_picamera.py → ..._add_white_balance_options_to_picamera.py b/..._add_white_balance_options_to_picamera.py → ..._add_white_balance_options_to_picamera.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("camera") as batch_op:

diff --git a/...c9eddfc845d_add_pid_pwm_min_max_option.py → ...c9eddfc845d_add_pid_pwm_min_max_option.py b/...c9eddfc845d_add_pid_pwm_min_max_option.py → ...c9eddfc845d_add_pid_pwm_min_max_option.py
diff --git a/...d_linux_command_output_option_user_to_.py → ...d_linux_command_output_option_user_to_.py b/...d_linux_command_output_option_user_to_.py → ...d_linux_command_output_option_user_to_.py
diff --git a/.../ed21c36670f4_add_32x64_pioled_options.py → .../ed21c36670f4_add_32x64_pioled_options.py b/.../ed21c36670f4_add_32x64_pioled_options.py → .../ed21c36670f4_add_32x64_pioled_options.py
diff --git a/...c/versions/ef49f6644e0c_save_user_code.py → ...c/versions/ef49f6644e0c_save_user_code.py b/...c/versions/ef49f6644e0c_save_user_code.py → ...c/versions/ef49f6644e0c_save_user_code.py
@@ -11,7 +11,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
 
-from databases.alembic_post_utils import write_revision_post_alembic
+from alembic_db.alembic_post_utils import write_revision_post_alembic
 
 from mycodo.config import SQL_DATABASE_MYCODO
 from mycodo.config import ID_FILE

diff --git a/..._add_ip_and_port_options_for_internet_.py → ..._add_ip_and_port_options_for_internet_.py b/..._add_ip_and_port_options_for_internet_.py → ..._add_ip_and_port_options_for_internet_.py
@@ -20,7 +20,7 @@ def upgrade():
  # import sys
  # import os
  # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- # from databases.alembic_post_utils import write_revision_post_alembic
+ # from alembic_db.alembic_post_utils import write_revision_post_alembic
  # write_revision_post_alembic(revision)
 
  with op.batch_alter_table("misc") as batch_op:

diff --git a/...ns/f5b77ef5f17c_change_smtp_db_options.py → ...ns/f5b77ef5f17c_change_smtp_db_options.py b/...ns/f5b77ef5f17c_change_smtp_db_options.py → ...ns/f5b77ef5f17c_change_smtp_db_options.py
@@ -20,7 +20,7 @@ def upgrade():
  import sys
  import os
  sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
- from databases.alembic_post_utils import write_revision_post_alembic
+ from alembic_db.alembic_post_utils import write_revision_post_alembic
  write_revision_post_alembic(revision)
 
  with op.batch_alter_table("smtp") as batch_op:

diff --git a/.../versions/f9ddbe510462_add_ttn_options.py → .../versions/f9ddbe510462_add_ttn_options.py b/.../versions/f9ddbe510462_add_ttn_options.py → .../versions/f9ddbe510462_add_ttn_options.py
diff --git a/databases/alembic_post.py → alembic_db/alembic_post.py b/databases/alembic_post.py → alembic_db/alembic_post.py
@@ -15,7 +15,7 @@
 # import sys
 # import os
 # sys.path.append(os.path.abspath(os.path.join(__file__, "../../../..")))
-# from databases.alembic_post_utils import write_revision_post_alembic
+# from alembic.alembic_post_utils import write_revision_post_alembic
 # def upgrade():
 # write_revision_post_alembic(revision)
 #
@@ -26,7 +26,7 @@
 
 sys.path.append(os.path.abspath(os.path.join(__file__, "../..")))
 
-from databases.alembic_post_utils import read_revision_file
+from alembic_db.alembic_post_utils import read_revision_file
 from mycodo.config import ALEMBIC_UPGRADE_POST
 from mycodo.config import SQL_DATABASE_MYCODO
 from mycodo.databases.utils import session_scope

diff --git a/databases/alembic_post_utils.py → alembic_db/alembic_post_utils.py b/databases/alembic_post_utils.py → alembic_db/alembic_post_utils.py
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -7,8 +7,7 @@ RUN useradd -ms /bin/bash mycodo
 
 COPY ./mycodo/scripts/upgrade_commands.sh /home/mycodo/mycodo/scripts/upgrade_commands.sh
 
-RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh create-files-directories
-RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh create-symlinks
+RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh docker-create-files-directories-symlinks
 RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh update-apt
 RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh update-packages
 RUN /home/mycodo/mycodo/scripts/upgrade_commands.sh ssl-certs-generate