tests: run development server on port 9090

Instead of running the dev server on port 8080 inside docker and expose it externally on port 9090.
yaal-coop · May 14, 2024 · f4cd6d6 · f4cd6d6
1 parent 2810d2a
commit f4cd6d6
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/docker-compose-dev-with-volumes.yml b/docker-compose-dev-with-volumes.yml
@@ -18,7 +18,7 @@ services:
     env_file:
       - ./.env.dev
     ports:
-      - 9090:8080
+      - 9090:9090
     volumes: *pod-volumes
 
   elasticsearch:

diff --git a/docker-compose-full-dev-with-volumes-test.yml b/docker-compose-full-dev-with-volumes-test.yml
@@ -18,7 +18,7 @@ services:
     env_file:
       - ./.env.dev
     ports:
-      - 9090:8080
+      - 9090:9090
     volumes: *pod-volumes
 
   pod-encode:

diff --git a/docker-compose-full-dev-with-volumes.yml b/docker-compose-full-dev-with-volumes.yml
@@ -18,7 +18,7 @@ services:
     env_file:
       - ./.env.dev
     ports:
-      - 9090:8080
+      - 9090:9090
     volumes: *pod-volumes
 
   pod-encode:

diff --git a/dockerfile-dev-with-volumes/pa11y-ci/config.json b/dockerfile-dev-with-volumes/pa11y-ci/config.json
@@ -18,10 +18,10 @@
         ]
     },
     "urls": [
-        "http://pod-back:8080/",
-        "http://pod-back:8080/accounts/login",
-        "http://pod-back:8080/videos",
-        "http://pod-back:8080/video/0001-video-test/",
-        "http://pod-back:8080/live/events/"
+        "http://pod-back:9090/",
+        "http://pod-back:9090/accounts/login",
+        "http://pod-back:9090/videos",
+        "http://pod-back:9090/video/0001-video-test/",
+        "http://pod-back:9090/live/events/"
     ]
 }
diff --git a/dockerfile-dev-with-volumes/pa11y-ci/config_mobile.json b/dockerfile-dev-with-volumes/pa11y-ci/config_mobile.json
@@ -19,10 +19,10 @@
         ]
     },
     "urls": [
-        "http://pod-back:8080/",
-        "http://pod-back:8080/accounts/login",
-        "http://pod-back:8080/videos",
-        "http://pod-back:8080/video/0001-video-test/",
-        "http://pod-back:8080/live/events/"
+        "http://pod-back:9090/",
+        "http://pod-back:9090/accounts/login",
+        "http://pod-back:9090/videos",
+        "http://pod-back:9090/video/0001-video-test/",
+        "http://pod-back:9090/live/events/"
     ]
 }
diff --git a/dockerfile-dev-with-volumes/pod-back/my-entrypoint-back.sh b/dockerfile-dev-with-volumes/pod-back/my-entrypoint-back.sh
@@ -25,5 +25,5 @@ fi
 # Le serveur de développement permet de tester vos futures modifications facilement.
 # N'hésitez pas à lancer le serveur de développement pour vérifier vos modifications au fur et à mesure.
 # À ce niveau, vous devriez avoir le site en français et en anglais et voir l'ensemble de la page d'accueil.
-python3 manage.py runserver 0.0.0.0:8080 --insecure
+python3 manage.py runserver 0.0.0.0:9090 --insecure
 sleep infinity
diff --git a/dockerfile-dev-with-volumes/pod-encode/my-entrypoint-encode.sh b/dockerfile-dev-with-volumes/pod-encode/my-entrypoint-encode.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "Launching commands into pod-dev"
-until nc -z pod-back 8080; do echo waiting for pod-back; sleep 10; done;
+until nc -z pod-back 9090; do echo waiting for pod-back; sleep 10; done;
 # Serveur d'encodage
 celery -A pod.video_encode_transcript.encoding_tasks worker -l INFO -Q encoding --concurrency 1 -n encode
 sleep infinity
diff --git a/dockerfile-dev-with-volumes/pod-transcript/my-entrypoint-transcript.sh b/dockerfile-dev-with-volumes/pod-transcript/my-entrypoint-transcript.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "Launching commands into pod-dev"
-until nc -z pod-back 8080; do echo waiting for pod-back; sleep 10; done;
+until nc -z pod-back 9090; do echo waiting for pod-back; sleep 10; done;
 # Serveur d'encodage
 celery -A pod.video_encode_transcript.transcripting_tasks worker -l INFO -Q transcripting --concurrency 1 -n transcript
 sleep infinity
diff --git a/dockerfile-dev-with-volumes/pod-xapi/my-entrypoint-xapi.sh b/dockerfile-dev-with-volumes/pod-xapi/my-entrypoint-xapi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "Launching commands into pod-dev"
-until nc -z pod-back 8080; do echo waiting for pod-back; sleep 10; done;
+until nc -z pod-back 9090; do echo waiting for pod-back; sleep 10; done;
 # Serveur xAPI
 celery -A pod.xapi.xapi_tasks worker -l INFO -Q xapi --concurrency 1 -n xapi
 sleep infinity
diff --git a/dockerfile-dev-with-volumes/pod/my-entrypoint.sh b/dockerfile-dev-with-volumes/pod/my-entrypoint.sh
@@ -25,5 +25,5 @@ fi
 # Le serveur de développement permet de tester vos futures modifications facilement.
 # N'hésitez pas à lancer le serveur de développement pour vérifier vos modifications au fur et à mesure.
 # À ce niveau, vous devriez avoir le site en français et en anglais et voir l'ensemble de la page d'accueil.
-python3 manage.py runserver 0.0.0.0:8080 --insecure
+python3 manage.py runserver 0.0.0.0:9090 --insecure
 sleep infinity
diff --git a/pod/custom/settings_local_docker_full_test.py b/pod/custom/settings_local_docker_full_test.py
@@ -60,7 +60,7 @@
 # If DOCKER_ENV = full: activate encoding, transcription and remote xapi
 USE_REMOTE_ENCODING_TRANSCODING = True
 ENCODING_TRANSCODING_CELERY_BROKER_URL = 'redis://redis:6379/7'
-POD_API_URL = "http://pod-back:8080/rest"
+POD_API_URL = "http://pod-back:9090/rest"
 POD_API_TOKEN = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 USE_TRANSCRIPTION = True