From 4bd374e8c89b1f2384ab53d12183730f197a68cf Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 29 Jul 2018 21:41:55 +0200 Subject: [PATCH] Move scripts/ to bin/ --- Dockerfile | 2 +- app/{scripts => bin}/app.sh | 4 ++-- app/{scripts => bin}/diag.sh | 0 app/{scripts => bin}/enumeration.sh | 0 app/{scripts => bin}/init.sh | 0 app/{scripts => bin}/install_plugins.sh | 0 app/{scripts => bin}/modelviz.py | 0 app/{scripts => bin}/notebook.sh | 0 app/{scripts => bin}/setup_plugins.sh | 0 app/{scripts => bin}/update_schema.sh | 0 app/{scripts => bin}/upgrade_from_1.6_to_1.7.sh | 0 app/{scripts => bin}/wait.sh | 0 app/{scripts => bin}/worker.sh | 2 +- {scripts => bin}/kdenlive/__init__.py | 0 {scripts => bin}/kdenlive/auto_fade.py | 0 {scripts => bin}/kdenlive/auto_fade_batch.py | 0 {scripts => bin}/kdenlive/fade.py | 0 {scripts => bin}/kdenlive/mlt_fix_threads.sh | 0 {scripts => bin}/kdenlive/mlt_process_batch.py | 0 {scripts => bin}/old/crem_checker.py | 0 {scripts => bin}/old/process-waveform-cgi.py | 0 {scripts => bin}/old/telemeta-backup.py | 0 {scripts => bin}/old/telemeta-crem-import-alt_ids.py | 0 {scripts => bin}/old/telemeta-crem-import-test.py | 0 {scripts => bin}/old/telemeta-crem-import.py | 0 {scripts => bin}/old/telemeta-media-link.py | 0 {scripts => bin}/sql/backup_db.sh | 0 {scripts => bin}/sql/convert_myisam_to_innodb.sql | 0 {scripts => bin}/sql/drop_timeside.sql | 0 {scripts => bin}/sql/fix_contentttypes.sql | 0 {scripts => bin}/sql/import_sql.sh | 0 {scripts => bin}/sql/restore_db.sh | 0 {scripts => bin}/transcode/create_thumbs.py | 0 {scripts => bin}/transcode/remux_fix_media.py | 0 {scripts => bin}/transcode/transcode.py | 0 bin/upgrade.sh | 3 +++ docker-compose.yml | 6 +++--- env/dev.yml | 4 ++-- env/notebook.yml | 2 +- scripts/upgrade.sh | 3 --- 40 files changed, 13 insertions(+), 13 deletions(-) rename app/{scripts => bin}/app.sh (94%) rename app/{scripts => bin}/diag.sh (100%) rename app/{scripts => bin}/enumeration.sh (100%) rename app/{scripts => bin}/init.sh (100%) rename app/{scripts => bin}/install_plugins.sh (100%) rename app/{scripts => bin}/modelviz.py (100%) rename app/{scripts => bin}/notebook.sh (100%) rename app/{scripts => bin}/setup_plugins.sh (100%) rename app/{scripts => bin}/update_schema.sh (100%) rename app/{scripts => bin}/upgrade_from_1.6_to_1.7.sh (100%) rename app/{scripts => bin}/wait.sh (100%) rename app/{scripts => bin}/worker.sh (96%) rename {scripts => bin}/kdenlive/__init__.py (100%) rename {scripts => bin}/kdenlive/auto_fade.py (100%) rename {scripts => bin}/kdenlive/auto_fade_batch.py (100%) rename {scripts => bin}/kdenlive/fade.py (100%) rename {scripts => bin}/kdenlive/mlt_fix_threads.sh (100%) rename {scripts => bin}/kdenlive/mlt_process_batch.py (100%) rename {scripts => bin}/old/crem_checker.py (100%) rename {scripts => bin}/old/process-waveform-cgi.py (100%) rename {scripts => bin}/old/telemeta-backup.py (100%) rename {scripts => bin}/old/telemeta-crem-import-alt_ids.py (100%) rename {scripts => bin}/old/telemeta-crem-import-test.py (100%) rename {scripts => bin}/old/telemeta-crem-import.py (100%) rename {scripts => bin}/old/telemeta-media-link.py (100%) rename {scripts => bin}/sql/backup_db.sh (100%) rename {scripts => bin}/sql/convert_myisam_to_innodb.sql (100%) rename {scripts => bin}/sql/drop_timeside.sql (100%) rename {scripts => bin}/sql/fix_contentttypes.sql (100%) rename {scripts => bin}/sql/import_sql.sh (100%) rename {scripts => bin}/sql/restore_db.sh (100%) rename {scripts => bin}/transcode/create_thumbs.py (100%) rename {scripts => bin}/transcode/remux_fix_media.py (100%) rename {scripts => bin}/transcode/transcode.py (100%) create mode 100755 bin/upgrade.sh delete mode 100755 scripts/upgrade.sh diff --git a/Dockerfile b/Dockerfile index f4ad8dec..fea6e0e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN /bin/bash /srv/app/scripts/setup_plugins.sh # Install Telemeta RUN pip install -r requirements.txt RUN pip install -r requirements-dev.txt --src /srv/lib -RUN pip uninstall -y South +RUN pip uninstall -y south WORKDIR /srv/app EXPOSE 8000 diff --git a/app/scripts/app.sh b/app/bin/app.sh similarity index 94% rename from app/scripts/app.sh rename to app/bin/app.sh index 6f5271e2..37568a03 100755 --- a/app/scripts/app.sh +++ b/app/bin/app.sh @@ -24,7 +24,7 @@ gid='www-data' # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta # waiting for other network services -sh $app/scripts/wait.sh +sh $app/bin/wait.sh python $manage wait-for-db if [ ! -f .init ]; then @@ -40,7 +40,7 @@ python $manage telemeta-setup-enumerations # Delete Timeside database if it exists -cat /srv/lib/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell +cat /srv/lib/telemeta/bin/sql/drop_timeside.sql | python $manage dbshell if [ $REINDEX = "True" ]; then python $manage rebuild_index --noinput diff --git a/app/scripts/diag.sh b/app/bin/diag.sh similarity index 100% rename from app/scripts/diag.sh rename to app/bin/diag.sh diff --git a/app/scripts/enumeration.sh b/app/bin/enumeration.sh similarity index 100% rename from app/scripts/enumeration.sh rename to app/bin/enumeration.sh diff --git a/app/scripts/init.sh b/app/bin/init.sh similarity index 100% rename from app/scripts/init.sh rename to app/bin/init.sh diff --git a/app/scripts/install_plugins.sh b/app/bin/install_plugins.sh similarity index 100% rename from app/scripts/install_plugins.sh rename to app/bin/install_plugins.sh diff --git a/app/scripts/modelviz.py b/app/bin/modelviz.py similarity index 100% rename from app/scripts/modelviz.py rename to app/bin/modelviz.py diff --git a/app/scripts/notebook.sh b/app/bin/notebook.sh similarity index 100% rename from app/scripts/notebook.sh rename to app/bin/notebook.sh diff --git a/app/scripts/setup_plugins.sh b/app/bin/setup_plugins.sh similarity index 100% rename from app/scripts/setup_plugins.sh rename to app/bin/setup_plugins.sh diff --git a/app/scripts/update_schema.sh b/app/bin/update_schema.sh similarity index 100% rename from app/scripts/update_schema.sh rename to app/bin/update_schema.sh diff --git a/app/scripts/upgrade_from_1.6_to_1.7.sh b/app/bin/upgrade_from_1.6_to_1.7.sh similarity index 100% rename from app/scripts/upgrade_from_1.6_to_1.7.sh rename to app/bin/upgrade_from_1.6_to_1.7.sh diff --git a/app/scripts/wait.sh b/app/bin/wait.sh similarity index 100% rename from app/scripts/wait.sh rename to app/bin/wait.sh diff --git a/app/scripts/worker.sh b/app/bin/worker.sh similarity index 96% rename from app/scripts/worker.sh rename to app/bin/worker.sh index 15ef8228..3eb7b40f 100755 --- a/app/scripts/worker.sh +++ b/app/bin/worker.sh @@ -14,7 +14,7 @@ concurrency=12 # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta # waiting for other services -bash $app/scripts/wait.sh +bash $app/bin/wait.sh # Starting celery worker with the --autoreload option will enable the worker to watch for file system changes # This is an experimental feature intended for use in development only diff --git a/scripts/kdenlive/__init__.py b/bin/kdenlive/__init__.py similarity index 100% rename from scripts/kdenlive/__init__.py rename to bin/kdenlive/__init__.py diff --git a/scripts/kdenlive/auto_fade.py b/bin/kdenlive/auto_fade.py similarity index 100% rename from scripts/kdenlive/auto_fade.py rename to bin/kdenlive/auto_fade.py diff --git a/scripts/kdenlive/auto_fade_batch.py b/bin/kdenlive/auto_fade_batch.py similarity index 100% rename from scripts/kdenlive/auto_fade_batch.py rename to bin/kdenlive/auto_fade_batch.py diff --git a/scripts/kdenlive/fade.py b/bin/kdenlive/fade.py similarity index 100% rename from scripts/kdenlive/fade.py rename to bin/kdenlive/fade.py diff --git a/scripts/kdenlive/mlt_fix_threads.sh b/bin/kdenlive/mlt_fix_threads.sh similarity index 100% rename from scripts/kdenlive/mlt_fix_threads.sh rename to bin/kdenlive/mlt_fix_threads.sh diff --git a/scripts/kdenlive/mlt_process_batch.py b/bin/kdenlive/mlt_process_batch.py similarity index 100% rename from scripts/kdenlive/mlt_process_batch.py rename to bin/kdenlive/mlt_process_batch.py diff --git a/scripts/old/crem_checker.py b/bin/old/crem_checker.py similarity index 100% rename from scripts/old/crem_checker.py rename to bin/old/crem_checker.py diff --git a/scripts/old/process-waveform-cgi.py b/bin/old/process-waveform-cgi.py similarity index 100% rename from scripts/old/process-waveform-cgi.py rename to bin/old/process-waveform-cgi.py diff --git a/scripts/old/telemeta-backup.py b/bin/old/telemeta-backup.py similarity index 100% rename from scripts/old/telemeta-backup.py rename to bin/old/telemeta-backup.py diff --git a/scripts/old/telemeta-crem-import-alt_ids.py b/bin/old/telemeta-crem-import-alt_ids.py similarity index 100% rename from scripts/old/telemeta-crem-import-alt_ids.py rename to bin/old/telemeta-crem-import-alt_ids.py diff --git a/scripts/old/telemeta-crem-import-test.py b/bin/old/telemeta-crem-import-test.py similarity index 100% rename from scripts/old/telemeta-crem-import-test.py rename to bin/old/telemeta-crem-import-test.py diff --git a/scripts/old/telemeta-crem-import.py b/bin/old/telemeta-crem-import.py similarity index 100% rename from scripts/old/telemeta-crem-import.py rename to bin/old/telemeta-crem-import.py diff --git a/scripts/old/telemeta-media-link.py b/bin/old/telemeta-media-link.py similarity index 100% rename from scripts/old/telemeta-media-link.py rename to bin/old/telemeta-media-link.py diff --git a/scripts/sql/backup_db.sh b/bin/sql/backup_db.sh similarity index 100% rename from scripts/sql/backup_db.sh rename to bin/sql/backup_db.sh diff --git a/scripts/sql/convert_myisam_to_innodb.sql b/bin/sql/convert_myisam_to_innodb.sql similarity index 100% rename from scripts/sql/convert_myisam_to_innodb.sql rename to bin/sql/convert_myisam_to_innodb.sql diff --git a/scripts/sql/drop_timeside.sql b/bin/sql/drop_timeside.sql similarity index 100% rename from scripts/sql/drop_timeside.sql rename to bin/sql/drop_timeside.sql diff --git a/scripts/sql/fix_contentttypes.sql b/bin/sql/fix_contentttypes.sql similarity index 100% rename from scripts/sql/fix_contentttypes.sql rename to bin/sql/fix_contentttypes.sql diff --git a/scripts/sql/import_sql.sh b/bin/sql/import_sql.sh similarity index 100% rename from scripts/sql/import_sql.sh rename to bin/sql/import_sql.sh diff --git a/scripts/sql/restore_db.sh b/bin/sql/restore_db.sh similarity index 100% rename from scripts/sql/restore_db.sh rename to bin/sql/restore_db.sh diff --git a/scripts/transcode/create_thumbs.py b/bin/transcode/create_thumbs.py similarity index 100% rename from scripts/transcode/create_thumbs.py rename to bin/transcode/create_thumbs.py diff --git a/scripts/transcode/remux_fix_media.py b/bin/transcode/remux_fix_media.py similarity index 100% rename from scripts/transcode/remux_fix_media.py rename to bin/transcode/remux_fix_media.py diff --git a/scripts/transcode/transcode.py b/bin/transcode/transcode.py similarity index 100% rename from scripts/transcode/transcode.py rename to bin/transcode/transcode.py diff --git a/bin/upgrade.sh b/bin/upgrade.sh new file mode 100755 index 00000000..a55e69d7 --- /dev/null +++ b/bin/upgrade.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker-compose run app /srv/bin/upgrade_from_1.6_to_1.7.sh diff --git a/docker-compose.yml b/docker-compose.yml index 9cd72c99..68585ff5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ data: db: image: mysql:5 volumes: - - ./scripts/:/srv/scripts + - ./bin/:/srv/bin - ./data/mysql/:/var/lib/mysql volumes_from: - data @@ -59,7 +59,7 @@ app: - data env_file: - env/prod.env - command: /bin/bash scripts/app.sh + command: /bin/bash bin/app.sh links: - broker - db @@ -72,7 +72,7 @@ worker: - data env_file: - env/prod.env - command: /bin/bash scripts/worker.sh + command: /bin/bash bin/worker.sh links: - broker - db diff --git a/env/dev.yml b/env/dev.yml index f5e68cc3..dfcaadab 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -26,7 +26,7 @@ app: image: parisson/telemeta:latest env_file: - env/debug.env - command: /bin/bash scripts/app.sh --runserver + command: /bin/bash bin/app.sh --runserver ports: - 9100:8000 @@ -37,4 +37,4 @@ worker: db: volumes: - - ./scripts/:/srv/scripts + - ./bin/:/srv/bin diff --git a/env/notebook.yml b/env/notebook.yml index 1c234ae0..5b85c759 100644 --- a/env/notebook.yml +++ b/env/notebook.yml @@ -24,4 +24,4 @@ app: ports: - "8888:8888" - command: "/srv/app/scripts/notebook.sh" + command: "/srv/app/bin/notebook.sh" diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh deleted file mode 100755 index 11673825..00000000 --- a/scripts/upgrade.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker-compose run app /srv/scripts/upgrade_from_1.6_to_1.7.sh -- 2.39.5