From 112146b1259d9e7e9db5992c98145cbb10a0718e Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Tue, 29 Oct 2024 15:18:49 -0700 Subject: [PATCH] Rename 'comptest' to 'frx_challenges' - Centralize all 'workingDir' declarations into the docker image Ref https://github.com/2i2c-org/frx-challenges/issues/98 --- .pre-commit-config.yaml | 2 +- CONTRIBUTING.md | 2 +- Dockerfile | 4 +-- .../frx_challenges}/__init__.py | 0 .../frx_challenges}/asgi.py | 4 +-- .../frx_challenges}/settings.py | 6 ++--- .../frx_challenges}/urls.py | 0 .../frx_challenges}/wsgi.py | 4 +-- {comptest => frx_challenges}/manage.py | 2 +- {comptest => frx_challenges}/web/__init__.py | 0 {comptest => frx_challenges}/web/admin.py | 0 {comptest => frx_challenges}/web/apps.py | 0 .../web/context_processors.py | 0 {comptest => frx_challenges}/web/forms.py | 0 .../web/management/__init__.py | 0 .../web/management/commands/evaluator.py | 0 .../web/management/commands/promote.py | 0 .../web/migrations/0001_initial.py | 0 ...ter_evaluation_evaluator_state_and_more.py | 0 .../0003_alter_evaluation_evaluator_state.py | 0 .../web/migrations/0004_submission_user.py | 0 .../0005_alter_evaluation_status.py | 0 .../0006_evaluation_last_updated.py | 0 .../0007_team_teammembership_team_members.py | 0 ...bers_alter_teammembership_team_and_more.py | 0 .../web/migrations/0009_page.py | 0 .../web/migrations/0010_page_order.py | 0 .../web/migrations/0011_page_is_home.py | 0 ...age_content_alter_page_is_home_and_more.py | 0 ...3_contentfile_remove_submission_project.py | 0 .../migrations/0014_alter_contentfile_file.py | 0 .../web/migrations/0015_page_mimetype.py | 0 .../migrations/0016_alter_page_mimetype.py | 0 .../migrations/0017_alter_contentfile_slug.py | 0 .../migrations/0018_page_header_content.py | 0 ...9_remove_evaluation_submission_and_more.py | 0 .../web/migrations/0020_submission_user.py | 0 ...data_remove_submission_gh_repo_and_more.py | 0 ...escription_remove_version_name_and_more.py | 0 .../0023_submissionmetadata_instructions.py | 0 .../0024_delete_submissionmetadata.py | 0 .../0025_alter_submission_metadata.py | 0 .../0026_alter_evaluation_version.py | 0 .../web/migrations/__init__.py | 0 {comptest => frx_challenges}/web/models.py | 0 .../web/package-lock.json | 0 {comptest => frx_challenges}/web/package.json | 0 .../web/static/web/bootstrap-theme.scss | 0 .../web/static/web/index.js | 0 .../web/static/web/index.scss | 0 .../web/static/webpack-output/main.css | 0 .../web/static/webpack-output/main.js | 0 .../static/webpack-output/main.js.LICENSE.txt | 0 .../web/templates/account/logout.html | 0 .../web/templates/page.html | 0 .../web/templates/page/view.html | 0 .../web/templates/results.html | 0 .../socialaccount/authentication_error.html | 0 .../web/templates/submission/create.html | 0 .../web/templates/submission/detail.html | 0 .../web/templates/submission/evaluation.html | 0 .../web/templates/submission/list.html | 0 .../web/templates/teams/add-member.html | 0 .../web/templates/teams/create.html | 0 .../web/templates/teams/list.html | 0 .../web/templates/teams/view.html | 0 .../web/templates/upload.html | 0 {comptest => frx_challenges}/web/tests.py | 0 {comptest => frx_challenges}/web/urls.py | 0 .../web/views/__init__.py | 0 .../web/views/default.py | 0 .../web/views/pages.py | 0 .../web/views/socialaccount.py | 0 .../web/views/submissions.py | 0 .../web/views/teams.py | 0 .../web/webpack.config.js | 0 helm-chart/templates/configmap-yamlconf.yaml | 2 +- helm-chart/templates/deployment.yaml | 27 ++++++++----------- 78 files changed, 24 insertions(+), 29 deletions(-) rename {comptest/comptest => frx_challenges/frx_challenges}/__init__.py (100%) rename {comptest/comptest => frx_challenges/frx_challenges}/asgi.py (71%) rename {comptest/comptest => frx_challenges/frx_challenges}/settings.py (98%) rename {comptest/comptest => frx_challenges/frx_challenges}/urls.py (100%) rename {comptest/comptest => frx_challenges/frx_challenges}/wsgi.py (71%) rename {comptest => frx_challenges}/manage.py (88%) rename {comptest => frx_challenges}/web/__init__.py (100%) rename {comptest => frx_challenges}/web/admin.py (100%) rename {comptest => frx_challenges}/web/apps.py (100%) rename {comptest => frx_challenges}/web/context_processors.py (100%) rename {comptest => frx_challenges}/web/forms.py (100%) rename {comptest => frx_challenges}/web/management/__init__.py (100%) rename {comptest => frx_challenges}/web/management/commands/evaluator.py (100%) rename {comptest => frx_challenges}/web/management/commands/promote.py (100%) rename {comptest => frx_challenges}/web/migrations/0001_initial.py (100%) rename {comptest => frx_challenges}/web/migrations/0002_alter_evaluation_evaluator_state_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0003_alter_evaluation_evaluator_state.py (100%) rename {comptest => frx_challenges}/web/migrations/0004_submission_user.py (100%) rename {comptest => frx_challenges}/web/migrations/0005_alter_evaluation_status.py (100%) rename {comptest => frx_challenges}/web/migrations/0006_evaluation_last_updated.py (100%) rename {comptest => frx_challenges}/web/migrations/0007_team_teammembership_team_members.py (100%) rename {comptest => frx_challenges}/web/migrations/0008_alter_team_members_alter_teammembership_team_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0009_page.py (100%) rename {comptest => frx_challenges}/web/migrations/0010_page_order.py (100%) rename {comptest => frx_challenges}/web/migrations/0011_page_is_home.py (100%) rename {comptest => frx_challenges}/web/migrations/0012_alter_page_content_alter_page_is_home_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0013_contentfile_remove_submission_project.py (100%) rename {comptest => frx_challenges}/web/migrations/0014_alter_contentfile_file.py (100%) rename {comptest => frx_challenges}/web/migrations/0015_page_mimetype.py (100%) rename {comptest => frx_challenges}/web/migrations/0016_alter_page_mimetype.py (100%) rename {comptest => frx_challenges}/web/migrations/0017_alter_contentfile_slug.py (100%) rename {comptest => frx_challenges}/web/migrations/0018_page_header_content.py (100%) rename {comptest => frx_challenges}/web/migrations/0019_remove_evaluation_submission_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0020_submission_user.py (100%) rename {comptest => frx_challenges}/web/migrations/0021_submissionmetadata_remove_submission_gh_repo_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0022_remove_version_description_remove_version_name_and_more.py (100%) rename {comptest => frx_challenges}/web/migrations/0023_submissionmetadata_instructions.py (100%) rename {comptest => frx_challenges}/web/migrations/0024_delete_submissionmetadata.py (100%) rename {comptest => frx_challenges}/web/migrations/0025_alter_submission_metadata.py (100%) rename {comptest => frx_challenges}/web/migrations/0026_alter_evaluation_version.py (100%) rename {comptest => frx_challenges}/web/migrations/__init__.py (100%) rename {comptest => frx_challenges}/web/models.py (100%) rename {comptest => frx_challenges}/web/package-lock.json (100%) rename {comptest => frx_challenges}/web/package.json (100%) rename {comptest => frx_challenges}/web/static/web/bootstrap-theme.scss (100%) rename {comptest => frx_challenges}/web/static/web/index.js (100%) rename {comptest => frx_challenges}/web/static/web/index.scss (100%) rename {comptest => frx_challenges}/web/static/webpack-output/main.css (100%) rename {comptest => frx_challenges}/web/static/webpack-output/main.js (100%) rename {comptest => frx_challenges}/web/static/webpack-output/main.js.LICENSE.txt (100%) rename {comptest => frx_challenges}/web/templates/account/logout.html (100%) rename {comptest => frx_challenges}/web/templates/page.html (100%) rename {comptest => frx_challenges}/web/templates/page/view.html (100%) rename {comptest => frx_challenges}/web/templates/results.html (100%) rename {comptest => frx_challenges}/web/templates/socialaccount/authentication_error.html (100%) rename {comptest => frx_challenges}/web/templates/submission/create.html (100%) rename {comptest => frx_challenges}/web/templates/submission/detail.html (100%) rename {comptest => frx_challenges}/web/templates/submission/evaluation.html (100%) rename {comptest => frx_challenges}/web/templates/submission/list.html (100%) rename {comptest => frx_challenges}/web/templates/teams/add-member.html (100%) rename {comptest => frx_challenges}/web/templates/teams/create.html (100%) rename {comptest => frx_challenges}/web/templates/teams/list.html (100%) rename {comptest => frx_challenges}/web/templates/teams/view.html (100%) rename {comptest => frx_challenges}/web/templates/upload.html (100%) rename {comptest => frx_challenges}/web/tests.py (100%) rename {comptest => frx_challenges}/web/urls.py (100%) rename {comptest => frx_challenges}/web/views/__init__.py (100%) rename {comptest => frx_challenges}/web/views/default.py (100%) rename {comptest => frx_challenges}/web/views/pages.py (100%) rename {comptest => frx_challenges}/web/views/socialaccount.py (100%) rename {comptest => frx_challenges}/web/views/submissions.py (100%) rename {comptest => frx_challenges}/web/views/teams.py (100%) rename {comptest => frx_challenges}/web/webpack.config.js (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2d3dafc..de566b0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,7 @@ repos: rev: v4.0.0-alpha.8 hooks: - id: prettier - exclude: ^helm-chart/templates/.*|^comptest/web/templates/.* + exclude: ^helm-chart/templates/.*|^frx_challenges/web/templates/.* # Autoformat and lint: HTML - repo: https://github.com/Riverside-Healthcare/djLint diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4efd9b3..e2ffc9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ python3 manage.py runserver In order to access the admin interface at `/admin`, your user needs to be a Django superuser. -Because we use GitHub external login we cannot use the existing `manage.py createsuperuser` command, so a separate [promote command](https://github.com/2i2c-org/frx-challenges/blob/main/comptest/web/management/commands/promote.py) was created to promote an existing user (created via GiHub login) into a superuser. +Because we use GitHub external login we cannot use the existing `manage.py createsuperuser` command, so a separate [promote command](https://github.com/2i2c-org/frx-challenges/blob/main/frx_challenges/web/management/commands/promote.py) was created to promote an existing user (created via GiHub login) into a superuser. Steps to access the admin interface: diff --git a/Dockerfile b/Dockerfile index 2f9a1fa..88d4257 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,6 @@ RUN mkdir /opt/frx-challenges COPY . /opt/frx-challenges -WORKDIR /opt/frx-challenges +WORKDIR /opt/frx-challenges/frx_challenges -RUN pip3 install -r requirements.txt +RUN pip3 install -r ../requirements.txt diff --git a/comptest/comptest/__init__.py b/frx_challenges/frx_challenges/__init__.py similarity index 100% rename from comptest/comptest/__init__.py rename to frx_challenges/frx_challenges/__init__.py diff --git a/comptest/comptest/asgi.py b/frx_challenges/frx_challenges/asgi.py similarity index 71% rename from comptest/comptest/asgi.py rename to frx_challenges/frx_challenges/asgi.py index 5f7d4b3..1bf59a9 100644 --- a/comptest/comptest/asgi.py +++ b/frx_challenges/frx_challenges/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for comptest project. +ASGI config for frx_challenges project. It exposes the ASGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.asgi import get_asgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "comptest.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "frx_challenges.settings") application = get_asgi_application() diff --git a/comptest/comptest/settings.py b/frx_challenges/frx_challenges/settings.py similarity index 98% rename from comptest/comptest/settings.py rename to frx_challenges/frx_challenges/settings.py index 90308d8..70efcba 100644 --- a/comptest/comptest/settings.py +++ b/frx_challenges/frx_challenges/settings.py @@ -1,5 +1,5 @@ """ -Django settings for comptest project. +Django settings for frx_challenges project. Generated by 'django-admin startproject' using Django 5.0.7. @@ -63,7 +63,7 @@ "allauth.account.middleware.AccountMiddleware", ] -ROOT_URLCONF = "comptest.urls" +ROOT_URLCONF = "frx_challenges.urls" TEMPLATES = [ { @@ -83,7 +83,7 @@ }, ] -WSGI_APPLICATION = "comptest.wsgi.application" +WSGI_APPLICATION = "frx_challenges.wsgi.application" # Database diff --git a/comptest/comptest/urls.py b/frx_challenges/frx_challenges/urls.py similarity index 100% rename from comptest/comptest/urls.py rename to frx_challenges/frx_challenges/urls.py diff --git a/comptest/comptest/wsgi.py b/frx_challenges/frx_challenges/wsgi.py similarity index 71% rename from comptest/comptest/wsgi.py rename to frx_challenges/frx_challenges/wsgi.py index 85bc970..fe01de7 100644 --- a/comptest/comptest/wsgi.py +++ b/frx_challenges/frx_challenges/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for comptest project. +WSGI config for frx_challenges project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "comptest.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "frx_challenges.settings") application = get_wsgi_application() diff --git a/comptest/manage.py b/frx_challenges/manage.py similarity index 88% rename from comptest/manage.py rename to frx_challenges/manage.py index c49bbb8..ce4d847 100755 --- a/comptest/manage.py +++ b/frx_challenges/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "comptest.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "frx_challenges.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/comptest/web/__init__.py b/frx_challenges/web/__init__.py similarity index 100% rename from comptest/web/__init__.py rename to frx_challenges/web/__init__.py diff --git a/comptest/web/admin.py b/frx_challenges/web/admin.py similarity index 100% rename from comptest/web/admin.py rename to frx_challenges/web/admin.py diff --git a/comptest/web/apps.py b/frx_challenges/web/apps.py similarity index 100% rename from comptest/web/apps.py rename to frx_challenges/web/apps.py diff --git a/comptest/web/context_processors.py b/frx_challenges/web/context_processors.py similarity index 100% rename from comptest/web/context_processors.py rename to frx_challenges/web/context_processors.py diff --git a/comptest/web/forms.py b/frx_challenges/web/forms.py similarity index 100% rename from comptest/web/forms.py rename to frx_challenges/web/forms.py diff --git a/comptest/web/management/__init__.py b/frx_challenges/web/management/__init__.py similarity index 100% rename from comptest/web/management/__init__.py rename to frx_challenges/web/management/__init__.py diff --git a/comptest/web/management/commands/evaluator.py b/frx_challenges/web/management/commands/evaluator.py similarity index 100% rename from comptest/web/management/commands/evaluator.py rename to frx_challenges/web/management/commands/evaluator.py diff --git a/comptest/web/management/commands/promote.py b/frx_challenges/web/management/commands/promote.py similarity index 100% rename from comptest/web/management/commands/promote.py rename to frx_challenges/web/management/commands/promote.py diff --git a/comptest/web/migrations/0001_initial.py b/frx_challenges/web/migrations/0001_initial.py similarity index 100% rename from comptest/web/migrations/0001_initial.py rename to frx_challenges/web/migrations/0001_initial.py diff --git a/comptest/web/migrations/0002_alter_evaluation_evaluator_state_and_more.py b/frx_challenges/web/migrations/0002_alter_evaluation_evaluator_state_and_more.py similarity index 100% rename from comptest/web/migrations/0002_alter_evaluation_evaluator_state_and_more.py rename to frx_challenges/web/migrations/0002_alter_evaluation_evaluator_state_and_more.py diff --git a/comptest/web/migrations/0003_alter_evaluation_evaluator_state.py b/frx_challenges/web/migrations/0003_alter_evaluation_evaluator_state.py similarity index 100% rename from comptest/web/migrations/0003_alter_evaluation_evaluator_state.py rename to frx_challenges/web/migrations/0003_alter_evaluation_evaluator_state.py diff --git a/comptest/web/migrations/0004_submission_user.py b/frx_challenges/web/migrations/0004_submission_user.py similarity index 100% rename from comptest/web/migrations/0004_submission_user.py rename to frx_challenges/web/migrations/0004_submission_user.py diff --git a/comptest/web/migrations/0005_alter_evaluation_status.py b/frx_challenges/web/migrations/0005_alter_evaluation_status.py similarity index 100% rename from comptest/web/migrations/0005_alter_evaluation_status.py rename to frx_challenges/web/migrations/0005_alter_evaluation_status.py diff --git a/comptest/web/migrations/0006_evaluation_last_updated.py b/frx_challenges/web/migrations/0006_evaluation_last_updated.py similarity index 100% rename from comptest/web/migrations/0006_evaluation_last_updated.py rename to frx_challenges/web/migrations/0006_evaluation_last_updated.py diff --git a/comptest/web/migrations/0007_team_teammembership_team_members.py b/frx_challenges/web/migrations/0007_team_teammembership_team_members.py similarity index 100% rename from comptest/web/migrations/0007_team_teammembership_team_members.py rename to frx_challenges/web/migrations/0007_team_teammembership_team_members.py diff --git a/comptest/web/migrations/0008_alter_team_members_alter_teammembership_team_and_more.py b/frx_challenges/web/migrations/0008_alter_team_members_alter_teammembership_team_and_more.py similarity index 100% rename from comptest/web/migrations/0008_alter_team_members_alter_teammembership_team_and_more.py rename to frx_challenges/web/migrations/0008_alter_team_members_alter_teammembership_team_and_more.py diff --git a/comptest/web/migrations/0009_page.py b/frx_challenges/web/migrations/0009_page.py similarity index 100% rename from comptest/web/migrations/0009_page.py rename to frx_challenges/web/migrations/0009_page.py diff --git a/comptest/web/migrations/0010_page_order.py b/frx_challenges/web/migrations/0010_page_order.py similarity index 100% rename from comptest/web/migrations/0010_page_order.py rename to frx_challenges/web/migrations/0010_page_order.py diff --git a/comptest/web/migrations/0011_page_is_home.py b/frx_challenges/web/migrations/0011_page_is_home.py similarity index 100% rename from comptest/web/migrations/0011_page_is_home.py rename to frx_challenges/web/migrations/0011_page_is_home.py diff --git a/comptest/web/migrations/0012_alter_page_content_alter_page_is_home_and_more.py b/frx_challenges/web/migrations/0012_alter_page_content_alter_page_is_home_and_more.py similarity index 100% rename from comptest/web/migrations/0012_alter_page_content_alter_page_is_home_and_more.py rename to frx_challenges/web/migrations/0012_alter_page_content_alter_page_is_home_and_more.py diff --git a/comptest/web/migrations/0013_contentfile_remove_submission_project.py b/frx_challenges/web/migrations/0013_contentfile_remove_submission_project.py similarity index 100% rename from comptest/web/migrations/0013_contentfile_remove_submission_project.py rename to frx_challenges/web/migrations/0013_contentfile_remove_submission_project.py diff --git a/comptest/web/migrations/0014_alter_contentfile_file.py b/frx_challenges/web/migrations/0014_alter_contentfile_file.py similarity index 100% rename from comptest/web/migrations/0014_alter_contentfile_file.py rename to frx_challenges/web/migrations/0014_alter_contentfile_file.py diff --git a/comptest/web/migrations/0015_page_mimetype.py b/frx_challenges/web/migrations/0015_page_mimetype.py similarity index 100% rename from comptest/web/migrations/0015_page_mimetype.py rename to frx_challenges/web/migrations/0015_page_mimetype.py diff --git a/comptest/web/migrations/0016_alter_page_mimetype.py b/frx_challenges/web/migrations/0016_alter_page_mimetype.py similarity index 100% rename from comptest/web/migrations/0016_alter_page_mimetype.py rename to frx_challenges/web/migrations/0016_alter_page_mimetype.py diff --git a/comptest/web/migrations/0017_alter_contentfile_slug.py b/frx_challenges/web/migrations/0017_alter_contentfile_slug.py similarity index 100% rename from comptest/web/migrations/0017_alter_contentfile_slug.py rename to frx_challenges/web/migrations/0017_alter_contentfile_slug.py diff --git a/comptest/web/migrations/0018_page_header_content.py b/frx_challenges/web/migrations/0018_page_header_content.py similarity index 100% rename from comptest/web/migrations/0018_page_header_content.py rename to frx_challenges/web/migrations/0018_page_header_content.py diff --git a/comptest/web/migrations/0019_remove_evaluation_submission_and_more.py b/frx_challenges/web/migrations/0019_remove_evaluation_submission_and_more.py similarity index 100% rename from comptest/web/migrations/0019_remove_evaluation_submission_and_more.py rename to frx_challenges/web/migrations/0019_remove_evaluation_submission_and_more.py diff --git a/comptest/web/migrations/0020_submission_user.py b/frx_challenges/web/migrations/0020_submission_user.py similarity index 100% rename from comptest/web/migrations/0020_submission_user.py rename to frx_challenges/web/migrations/0020_submission_user.py diff --git a/comptest/web/migrations/0021_submissionmetadata_remove_submission_gh_repo_and_more.py b/frx_challenges/web/migrations/0021_submissionmetadata_remove_submission_gh_repo_and_more.py similarity index 100% rename from comptest/web/migrations/0021_submissionmetadata_remove_submission_gh_repo_and_more.py rename to frx_challenges/web/migrations/0021_submissionmetadata_remove_submission_gh_repo_and_more.py diff --git a/comptest/web/migrations/0022_remove_version_description_remove_version_name_and_more.py b/frx_challenges/web/migrations/0022_remove_version_description_remove_version_name_and_more.py similarity index 100% rename from comptest/web/migrations/0022_remove_version_description_remove_version_name_and_more.py rename to frx_challenges/web/migrations/0022_remove_version_description_remove_version_name_and_more.py diff --git a/comptest/web/migrations/0023_submissionmetadata_instructions.py b/frx_challenges/web/migrations/0023_submissionmetadata_instructions.py similarity index 100% rename from comptest/web/migrations/0023_submissionmetadata_instructions.py rename to frx_challenges/web/migrations/0023_submissionmetadata_instructions.py diff --git a/comptest/web/migrations/0024_delete_submissionmetadata.py b/frx_challenges/web/migrations/0024_delete_submissionmetadata.py similarity index 100% rename from comptest/web/migrations/0024_delete_submissionmetadata.py rename to frx_challenges/web/migrations/0024_delete_submissionmetadata.py diff --git a/comptest/web/migrations/0025_alter_submission_metadata.py b/frx_challenges/web/migrations/0025_alter_submission_metadata.py similarity index 100% rename from comptest/web/migrations/0025_alter_submission_metadata.py rename to frx_challenges/web/migrations/0025_alter_submission_metadata.py diff --git a/comptest/web/migrations/0026_alter_evaluation_version.py b/frx_challenges/web/migrations/0026_alter_evaluation_version.py similarity index 100% rename from comptest/web/migrations/0026_alter_evaluation_version.py rename to frx_challenges/web/migrations/0026_alter_evaluation_version.py diff --git a/comptest/web/migrations/__init__.py b/frx_challenges/web/migrations/__init__.py similarity index 100% rename from comptest/web/migrations/__init__.py rename to frx_challenges/web/migrations/__init__.py diff --git a/comptest/web/models.py b/frx_challenges/web/models.py similarity index 100% rename from comptest/web/models.py rename to frx_challenges/web/models.py diff --git a/comptest/web/package-lock.json b/frx_challenges/web/package-lock.json similarity index 100% rename from comptest/web/package-lock.json rename to frx_challenges/web/package-lock.json diff --git a/comptest/web/package.json b/frx_challenges/web/package.json similarity index 100% rename from comptest/web/package.json rename to frx_challenges/web/package.json diff --git a/comptest/web/static/web/bootstrap-theme.scss b/frx_challenges/web/static/web/bootstrap-theme.scss similarity index 100% rename from comptest/web/static/web/bootstrap-theme.scss rename to frx_challenges/web/static/web/bootstrap-theme.scss diff --git a/comptest/web/static/web/index.js b/frx_challenges/web/static/web/index.js similarity index 100% rename from comptest/web/static/web/index.js rename to frx_challenges/web/static/web/index.js diff --git a/comptest/web/static/web/index.scss b/frx_challenges/web/static/web/index.scss similarity index 100% rename from comptest/web/static/web/index.scss rename to frx_challenges/web/static/web/index.scss diff --git a/comptest/web/static/webpack-output/main.css b/frx_challenges/web/static/webpack-output/main.css similarity index 100% rename from comptest/web/static/webpack-output/main.css rename to frx_challenges/web/static/webpack-output/main.css diff --git a/comptest/web/static/webpack-output/main.js b/frx_challenges/web/static/webpack-output/main.js similarity index 100% rename from comptest/web/static/webpack-output/main.js rename to frx_challenges/web/static/webpack-output/main.js diff --git a/comptest/web/static/webpack-output/main.js.LICENSE.txt b/frx_challenges/web/static/webpack-output/main.js.LICENSE.txt similarity index 100% rename from comptest/web/static/webpack-output/main.js.LICENSE.txt rename to frx_challenges/web/static/webpack-output/main.js.LICENSE.txt diff --git a/comptest/web/templates/account/logout.html b/frx_challenges/web/templates/account/logout.html similarity index 100% rename from comptest/web/templates/account/logout.html rename to frx_challenges/web/templates/account/logout.html diff --git a/comptest/web/templates/page.html b/frx_challenges/web/templates/page.html similarity index 100% rename from comptest/web/templates/page.html rename to frx_challenges/web/templates/page.html diff --git a/comptest/web/templates/page/view.html b/frx_challenges/web/templates/page/view.html similarity index 100% rename from comptest/web/templates/page/view.html rename to frx_challenges/web/templates/page/view.html diff --git a/comptest/web/templates/results.html b/frx_challenges/web/templates/results.html similarity index 100% rename from comptest/web/templates/results.html rename to frx_challenges/web/templates/results.html diff --git a/comptest/web/templates/socialaccount/authentication_error.html b/frx_challenges/web/templates/socialaccount/authentication_error.html similarity index 100% rename from comptest/web/templates/socialaccount/authentication_error.html rename to frx_challenges/web/templates/socialaccount/authentication_error.html diff --git a/comptest/web/templates/submission/create.html b/frx_challenges/web/templates/submission/create.html similarity index 100% rename from comptest/web/templates/submission/create.html rename to frx_challenges/web/templates/submission/create.html diff --git a/comptest/web/templates/submission/detail.html b/frx_challenges/web/templates/submission/detail.html similarity index 100% rename from comptest/web/templates/submission/detail.html rename to frx_challenges/web/templates/submission/detail.html diff --git a/comptest/web/templates/submission/evaluation.html b/frx_challenges/web/templates/submission/evaluation.html similarity index 100% rename from comptest/web/templates/submission/evaluation.html rename to frx_challenges/web/templates/submission/evaluation.html diff --git a/comptest/web/templates/submission/list.html b/frx_challenges/web/templates/submission/list.html similarity index 100% rename from comptest/web/templates/submission/list.html rename to frx_challenges/web/templates/submission/list.html diff --git a/comptest/web/templates/teams/add-member.html b/frx_challenges/web/templates/teams/add-member.html similarity index 100% rename from comptest/web/templates/teams/add-member.html rename to frx_challenges/web/templates/teams/add-member.html diff --git a/comptest/web/templates/teams/create.html b/frx_challenges/web/templates/teams/create.html similarity index 100% rename from comptest/web/templates/teams/create.html rename to frx_challenges/web/templates/teams/create.html diff --git a/comptest/web/templates/teams/list.html b/frx_challenges/web/templates/teams/list.html similarity index 100% rename from comptest/web/templates/teams/list.html rename to frx_challenges/web/templates/teams/list.html diff --git a/comptest/web/templates/teams/view.html b/frx_challenges/web/templates/teams/view.html similarity index 100% rename from comptest/web/templates/teams/view.html rename to frx_challenges/web/templates/teams/view.html diff --git a/comptest/web/templates/upload.html b/frx_challenges/web/templates/upload.html similarity index 100% rename from comptest/web/templates/upload.html rename to frx_challenges/web/templates/upload.html diff --git a/comptest/web/tests.py b/frx_challenges/web/tests.py similarity index 100% rename from comptest/web/tests.py rename to frx_challenges/web/tests.py diff --git a/comptest/web/urls.py b/frx_challenges/web/urls.py similarity index 100% rename from comptest/web/urls.py rename to frx_challenges/web/urls.py diff --git a/comptest/web/views/__init__.py b/frx_challenges/web/views/__init__.py similarity index 100% rename from comptest/web/views/__init__.py rename to frx_challenges/web/views/__init__.py diff --git a/comptest/web/views/default.py b/frx_challenges/web/views/default.py similarity index 100% rename from comptest/web/views/default.py rename to frx_challenges/web/views/default.py diff --git a/comptest/web/views/pages.py b/frx_challenges/web/views/pages.py similarity index 100% rename from comptest/web/views/pages.py rename to frx_challenges/web/views/pages.py diff --git a/comptest/web/views/socialaccount.py b/frx_challenges/web/views/socialaccount.py similarity index 100% rename from comptest/web/views/socialaccount.py rename to frx_challenges/web/views/socialaccount.py diff --git a/comptest/web/views/submissions.py b/frx_challenges/web/views/submissions.py similarity index 100% rename from comptest/web/views/submissions.py rename to frx_challenges/web/views/submissions.py diff --git a/comptest/web/views/teams.py b/frx_challenges/web/views/teams.py similarity index 100% rename from comptest/web/views/teams.py rename to frx_challenges/web/views/teams.py diff --git a/comptest/web/webpack.config.js b/frx_challenges/web/webpack.config.js similarity index 100% rename from comptest/web/webpack.config.js rename to frx_challenges/web/webpack.config.js diff --git a/helm-chart/templates/configmap-yamlconf.yaml b/helm-chart/templates/configmap-yamlconf.yaml index 4057e13..4c7a490 100644 --- a/helm-chart/templates/configmap-yamlconf.yaml +++ b/helm-chart/templates/configmap-yamlconf.yaml @@ -3,5 +3,5 @@ kind: ConfigMap metadata: name: {{ include "frx-challenges.fullname" . }}-django-yamlconf data: - comptest.yaml: | + frx_challenges.yaml: | {{ mustToJson .Values.yamlSettings.overrides }} diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml index cdb393c..bf55b6f 100644 --- a/helm-chart/templates/deployment.yaml +++ b/helm-chart/templates/deployment.yaml @@ -28,7 +28,6 @@ spec: - name: db-migrate image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - workingDir: /opt/frx-challenges/comptest command: - python - manage.py @@ -39,12 +38,11 @@ spec: - name: storage mountPath: /opt/state - name: django-yamlconf - mountPath: /opt/frx-challenges/comptest/comptest.yaml - subPath: comptest.yaml + mountPath: /opt/frx-challenges/frx_challenges/frx_challenges.yaml + subPath: frx_challenges.yaml - name: collect-static image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - workingDir: /opt/frx-challenges/comptest command: - python - manage.py @@ -54,14 +52,13 @@ spec: runAsUser: 0 volumeMounts: - name: django-yamlconf - mountPath: /opt/frx-challenges/comptest/comptest.yaml - subPath: comptest.yaml + mountPath: /opt/frx-challenges/frx_challenges/frx_challenges.yaml + subPath: frx_challenges.yaml - name: staticfiles mountPath: /opt/staticfiles - name: admin-add image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - workingDir: /opt/frx-challenges/comptest command: {{- if .Values.adminUsers }} - python @@ -80,8 +77,8 @@ spec: - name: storage mountPath: /opt/state - name: django-yamlconf - mountPath: /opt/frx-challenges/comptest/comptest.yaml - subPath: comptest.yaml + mountPath: /opt/frx-challenges/frx_challenges/frx_challenges.yaml + subPath: frx_challenges.yaml {{ with .Values.extraInitContainers }} {{ $extraInitContainers := . }} {{ $sortedKeys := keys $extraInitContainers | sortAlpha }} @@ -93,12 +90,11 @@ spec: - name: django image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - workingDir: /opt/frx-challenges/comptest command: - gunicorn - --bind - 127.0.0.1:8000 - - comptest.wsgi + - frx_challenges.wsgi securityContext: runAsUser: 0 resources: {{ toJson .Values.resources }} @@ -106,8 +102,8 @@ spec: - name: storage mountPath: /opt/state - name: django-yamlconf - mountPath: /opt/frx-challenges/comptest/comptest.yaml - subPath: comptest.yaml + mountPath: /opt/frx-challenges/frx_challenges/frx_challenges.yaml + subPath: frx_challenges.yaml - name: dind image: {{ .Values.dind.image.repository }}:{{ .Values.dind.image.tag }} command: @@ -128,7 +124,6 @@ spec: - name: evaluator image: {{ .Values.image.repository }}:{{ .Values.image.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - workingDir: /opt/frx-challenges/comptest command: - python - manage.py @@ -139,8 +134,8 @@ spec: - name: storage mountPath: /opt/state - name: django-yamlconf - mountPath: /opt/frx-challenges/comptest/comptest.yaml - subPath: comptest.yaml + mountPath: /opt/frx-challenges/frx_challenges/frx_challenges.yaml + subPath: frx_challenges.yaml env: - name: DOCKER_HOST value: tcp://127.0.0.1:2376