Rename 'comptest' to 'frx_challenges'

- Centralize all 'workingDir' declarations into the docker image Ref 2i2c-org#98
jnywong · Oct 29, 2024 · 112146b · 112146b
1 parent 1b4cfb1
commit 112146b
Show file tree

Hide file tree

Showing 78 changed files with 24 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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 → frx_challenges/frx_challenges/__init__.py b/comptest/comptest/__init__.py → frx_challenges/frx_challenges/__init__.py
diff --git a/comptest/comptest/asgi.py → frx_challenges/frx_challenges/asgi.py b/comptest/comptest/asgi.py → 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 → frx_challenges/frx_challenges/settings.py b/comptest/comptest/settings.py → 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 → frx_challenges/frx_challenges/urls.py b/comptest/comptest/urls.py → frx_challenges/frx_challenges/urls.py
diff --git a/comptest/comptest/wsgi.py → frx_challenges/frx_challenges/wsgi.py b/comptest/comptest/wsgi.py → 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 → frx_challenges/manage.py b/comptest/manage.py → 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 → frx_challenges/web/__init__.py b/comptest/web/__init__.py → frx_challenges/web/__init__.py
diff --git a/comptest/web/admin.py → frx_challenges/web/admin.py b/comptest/web/admin.py → frx_challenges/web/admin.py
diff --git a/comptest/web/apps.py → frx_challenges/web/apps.py b/comptest/web/apps.py → frx_challenges/web/apps.py
diff --git a/comptest/web/context_processors.py → frx_challenges/web/context_processors.py b/comptest/web/context_processors.py → frx_challenges/web/context_processors.py
diff --git a/comptest/web/forms.py → frx_challenges/web/forms.py b/comptest/web/forms.py → frx_challenges/web/forms.py
diff --git a/comptest/web/management/__init__.py → frx_challenges/web/management/__init__.py b/comptest/web/management/__init__.py → frx_challenges/web/management/__init__.py
diff --git a/...test/web/management/commands/evaluator.py → ...nges/web/management/commands/evaluator.py b/...test/web/management/commands/evaluator.py → ...nges/web/management/commands/evaluator.py
diff --git a/comptest/web/management/commands/promote.py → ...lenges/web/management/commands/promote.py b/comptest/web/management/commands/promote.py → ...lenges/web/management/commands/promote.py
diff --git a/comptest/web/migrations/0001_initial.py → ...challenges/web/migrations/0001_initial.py b/comptest/web/migrations/0001_initial.py → ...challenges/web/migrations/0001_initial.py
diff --git a/...er_evaluation_evaluator_state_and_more.py → ...er_evaluation_evaluator_state_and_more.py b/...er_evaluation_evaluator_state_and_more.py → ...er_evaluation_evaluator_state_and_more.py
diff --git a/.../0003_alter_evaluation_evaluator_state.py → .../0003_alter_evaluation_evaluator_state.py b/.../0003_alter_evaluation_evaluator_state.py → .../0003_alter_evaluation_evaluator_state.py
diff --git a/...st/web/migrations/0004_submission_user.py → ...es/web/migrations/0004_submission_user.py b/...st/web/migrations/0004_submission_user.py → ...es/web/migrations/0004_submission_user.py
diff --git a/...igrations/0005_alter_evaluation_status.py → ...igrations/0005_alter_evaluation_status.py b/...igrations/0005_alter_evaluation_status.py → ...igrations/0005_alter_evaluation_status.py
diff --git a/...igrations/0006_evaluation_last_updated.py → ...igrations/0006_evaluation_last_updated.py b/...igrations/0006_evaluation_last_updated.py → ...igrations/0006_evaluation_last_updated.py
diff --git a/.../0007_team_teammembership_team_members.py → .../0007_team_teammembership_team_members.py b/.../0007_team_teammembership_team_members.py → .../0007_team_teammembership_team_members.py
diff --git a/...ers_alter_teammembership_team_and_more.py → ...ers_alter_teammembership_team_and_more.py b/...ers_alter_teammembership_team_and_more.py → ...ers_alter_teammembership_team_and_more.py
diff --git a/comptest/web/migrations/0009_page.py → frx_challenges/web/migrations/0009_page.py b/comptest/web/migrations/0009_page.py → frx_challenges/web/migrations/0009_page.py
diff --git a/comptest/web/migrations/0010_page_order.py → ...llenges/web/migrations/0010_page_order.py b/comptest/web/migrations/0010_page_order.py → ...llenges/web/migrations/0010_page_order.py
diff --git a/comptest/web/migrations/0011_page_is_home.py → ...enges/web/migrations/0011_page_is_home.py b/comptest/web/migrations/0011_page_is_home.py → ...enges/web/migrations/0011_page_is_home.py
diff --git a/...ge_content_alter_page_is_home_and_more.py → ...ge_content_alter_page_is_home_and_more.py b/...ge_content_alter_page_is_home_and_more.py → ...ge_content_alter_page_is_home_and_more.py
diff --git a/..._contentfile_remove_submission_project.py → ..._contentfile_remove_submission_project.py b/..._contentfile_remove_submission_project.py → ..._contentfile_remove_submission_project.py
diff --git a/...migrations/0014_alter_contentfile_file.py → ...migrations/0014_alter_contentfile_file.py b/...migrations/0014_alter_contentfile_file.py → ...migrations/0014_alter_contentfile_file.py
diff --git a/...test/web/migrations/0015_page_mimetype.py → ...nges/web/migrations/0015_page_mimetype.py b/...test/web/migrations/0015_page_mimetype.py → ...nges/web/migrations/0015_page_mimetype.py
diff --git a/...eb/migrations/0016_alter_page_mimetype.py → ...eb/migrations/0016_alter_page_mimetype.py b/...eb/migrations/0016_alter_page_mimetype.py → ...eb/migrations/0016_alter_page_mimetype.py
diff --git a/...migrations/0017_alter_contentfile_slug.py → ...migrations/0017_alter_contentfile_slug.py b/...migrations/0017_alter_contentfile_slug.py → ...migrations/0017_alter_contentfile_slug.py
diff --git a/...eb/migrations/0018_page_header_content.py → ...eb/migrations/0018_page_header_content.py b/...eb/migrations/0018_page_header_content.py → ...eb/migrations/0018_page_header_content.py
diff --git a/..._remove_evaluation_submission_and_more.py → ..._remove_evaluation_submission_and_more.py b/..._remove_evaluation_submission_and_more.py → ..._remove_evaluation_submission_and_more.py
diff --git a/...st/web/migrations/0020_submission_user.py → ...es/web/migrations/0020_submission_user.py b/...st/web/migrations/0020_submission_user.py → ...es/web/migrations/0020_submission_user.py
diff --git a/...ata_remove_submission_gh_repo_and_more.py → ...ata_remove_submission_gh_repo_and_more.py b/...ata_remove_submission_gh_repo_and_more.py → ...ata_remove_submission_gh_repo_and_more.py
diff --git a/...scription_remove_version_name_and_more.py → ...scription_remove_version_name_and_more.py b/...scription_remove_version_name_and_more.py → ...scription_remove_version_name_and_more.py
diff --git a/...s/0023_submissionmetadata_instructions.py → ...s/0023_submissionmetadata_instructions.py b/...s/0023_submissionmetadata_instructions.py → ...s/0023_submissionmetadata_instructions.py
diff --git a/...rations/0024_delete_submissionmetadata.py → ...rations/0024_delete_submissionmetadata.py b/...rations/0024_delete_submissionmetadata.py → ...rations/0024_delete_submissionmetadata.py
diff --git a/...rations/0025_alter_submission_metadata.py → ...rations/0025_alter_submission_metadata.py b/...rations/0025_alter_submission_metadata.py → ...rations/0025_alter_submission_metadata.py
diff --git a/...grations/0026_alter_evaluation_version.py → ...grations/0026_alter_evaluation_version.py b/...grations/0026_alter_evaluation_version.py → ...grations/0026_alter_evaluation_version.py
diff --git a/comptest/web/migrations/__init__.py → frx_challenges/web/migrations/__init__.py b/comptest/web/migrations/__init__.py → frx_challenges/web/migrations/__init__.py
diff --git a/comptest/web/models.py → frx_challenges/web/models.py b/comptest/web/models.py → frx_challenges/web/models.py
diff --git a/comptest/web/package-lock.json → frx_challenges/web/package-lock.json b/comptest/web/package-lock.json → frx_challenges/web/package-lock.json
diff --git a/comptest/web/package.json → frx_challenges/web/package.json b/comptest/web/package.json → frx_challenges/web/package.json
diff --git a/comptest/web/static/web/bootstrap-theme.scss → ...enges/web/static/web/bootstrap-theme.scss b/comptest/web/static/web/bootstrap-theme.scss → ...enges/web/static/web/bootstrap-theme.scss
diff --git a/comptest/web/static/web/index.js → frx_challenges/web/static/web/index.js b/comptest/web/static/web/index.js → frx_challenges/web/static/web/index.js
diff --git a/comptest/web/static/web/index.scss → frx_challenges/web/static/web/index.scss b/comptest/web/static/web/index.scss → frx_challenges/web/static/web/index.scss
diff --git a/comptest/web/static/webpack-output/main.css → ...lenges/web/static/webpack-output/main.css b/comptest/web/static/webpack-output/main.css → ...lenges/web/static/webpack-output/main.css
diff --git a/comptest/web/static/webpack-output/main.js → ...llenges/web/static/webpack-output/main.js b/comptest/web/static/webpack-output/main.js → ...llenges/web/static/webpack-output/main.js
diff --git a/...static/webpack-output/main.js.LICENSE.txt → ...static/webpack-output/main.js.LICENSE.txt b/...static/webpack-output/main.js.LICENSE.txt → ...static/webpack-output/main.js.LICENSE.txt
diff --git a/comptest/web/templates/account/logout.html → ...llenges/web/templates/account/logout.html b/comptest/web/templates/account/logout.html → ...llenges/web/templates/account/logout.html
diff --git a/comptest/web/templates/page.html → frx_challenges/web/templates/page.html b/comptest/web/templates/page.html → frx_challenges/web/templates/page.html
diff --git a/comptest/web/templates/page/view.html → frx_challenges/web/templates/page/view.html b/comptest/web/templates/page/view.html → frx_challenges/web/templates/page/view.html
diff --git a/comptest/web/templates/results.html → frx_challenges/web/templates/results.html b/comptest/web/templates/results.html → frx_challenges/web/templates/results.html
diff --git a/...s/socialaccount/authentication_error.html → ...s/socialaccount/authentication_error.html b/...s/socialaccount/authentication_error.html → ...s/socialaccount/authentication_error.html
diff --git a/...test/web/templates/submission/create.html → ...nges/web/templates/submission/create.html b/...test/web/templates/submission/create.html → ...nges/web/templates/submission/create.html
diff --git a/...test/web/templates/submission/detail.html → ...nges/web/templates/submission/detail.html b/...test/web/templates/submission/detail.html → ...nges/web/templates/submission/detail.html
diff --git a/.../web/templates/submission/evaluation.html → .../web/templates/submission/evaluation.html b/.../web/templates/submission/evaluation.html → .../web/templates/submission/evaluation.html
diff --git a/comptest/web/templates/submission/list.html → ...lenges/web/templates/submission/list.html b/comptest/web/templates/submission/list.html → ...lenges/web/templates/submission/list.html
diff --git a/comptest/web/templates/teams/add-member.html → ...enges/web/templates/teams/add-member.html b/comptest/web/templates/teams/add-member.html → ...enges/web/templates/teams/add-member.html
diff --git a/comptest/web/templates/teams/create.html → ...hallenges/web/templates/teams/create.html b/comptest/web/templates/teams/create.html → ...hallenges/web/templates/teams/create.html
diff --git a/comptest/web/templates/teams/list.html → frx_challenges/web/templates/teams/list.html b/comptest/web/templates/teams/list.html → frx_challenges/web/templates/teams/list.html
diff --git a/comptest/web/templates/teams/view.html → frx_challenges/web/templates/teams/view.html b/comptest/web/templates/teams/view.html → frx_challenges/web/templates/teams/view.html
diff --git a/comptest/web/templates/upload.html → frx_challenges/web/templates/upload.html b/comptest/web/templates/upload.html → frx_challenges/web/templates/upload.html
diff --git a/comptest/web/tests.py → frx_challenges/web/tests.py b/comptest/web/tests.py → frx_challenges/web/tests.py
diff --git a/comptest/web/urls.py → frx_challenges/web/urls.py b/comptest/web/urls.py → frx_challenges/web/urls.py
diff --git a/comptest/web/views/__init__.py → frx_challenges/web/views/__init__.py b/comptest/web/views/__init__.py → frx_challenges/web/views/__init__.py
diff --git a/comptest/web/views/default.py → frx_challenges/web/views/default.py b/comptest/web/views/default.py → frx_challenges/web/views/default.py
diff --git a/comptest/web/views/pages.py → frx_challenges/web/views/pages.py b/comptest/web/views/pages.py → frx_challenges/web/views/pages.py
diff --git a/comptest/web/views/socialaccount.py → frx_challenges/web/views/socialaccount.py b/comptest/web/views/socialaccount.py → frx_challenges/web/views/socialaccount.py
diff --git a/comptest/web/views/submissions.py → frx_challenges/web/views/submissions.py b/comptest/web/views/submissions.py → frx_challenges/web/views/submissions.py
diff --git a/comptest/web/views/teams.py → frx_challenges/web/views/teams.py b/comptest/web/views/teams.py → frx_challenges/web/views/teams.py
diff --git a/comptest/web/webpack.config.js → frx_challenges/web/webpack.config.js b/comptest/web/webpack.config.js → frx_challenges/web/webpack.config.js
diff --git 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
@@ -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,21 +90,20 @@ 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 }}
           volumeMounts:
             - 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