Merge branch 'main' into feat/dark-mode

.devcontainer/devcontainer.json

@@ -7,6 +7,7 @@
     "workspaceFolder": "/workspace",
     "shutdownAction": "stopCompose",
     "postCreateCommand": "/docker-init.sh",
+    "postStartCommand": "/docker-start.sh",
     "containerEnv": {
         "EDITOR_VSCODE": "true"
     },
@@ -66,7 +67,7 @@
     },
     
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [3000, 5432, 5433, 8000, 8001],
+    "forwardPorts": [3000, 5432, 8000],
     
     "portsAttributes": {
         "3000": {
@@ -77,17 +78,13 @@
             "label": "PostgreSQL",
             "onAutoForward": "silent"
         },
-        "5433": {
-            "label": "pgAdmin",
-            "onAutoForward": "silent"
-        },
         "8000": {
-            "label": "Datatracker",
+            "label": "NGINX",
             "onAutoForward": "notify"
         },
         "8001": {
-            "label": "Static",
+            "label": "Datatracker",
-            "onAutoForward": "silent"
+            "onAutoForward": "ignore"
         }
     },
     

.devcontainer/docker-compose.extend.yml

@@ -15,8 +15,5 @@ services:
         # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
         network_mode: service:db
 
-    pgadmin:
-        network_mode: service:db
-
 volumes:
     datatracker-vscode-ext:

.github/workflows/build.yml

@@ -62,7 +62,7 @@ jobs:
       uses: ietf-tools/semver-action@v1
       with:
         token: ${{ github.token }}
-        branch: main
+        branch: release
         skipInvalidTags: true
         
     - name: Set Next Version Env Var

.github/workflows/ci-run-tests.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - 'main'
-      - 'feat/django4'
     paths:
       - 'client/**'
       - 'ietf/**'

.vscode/launch.json

@@ -12,7 +12,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local"
             ],
             "django": true,
@@ -30,7 +30,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local_vite"
             ],
             "django": true,
@@ -48,7 +48,7 @@
             "program": "${workspaceFolder}/ietf/manage.py",
             "args": [
                 "runserver",
-                "0.0.0.0:8000",
+                "0.0.0.0:8001",
                 "--settings=settings_local_debug"
             ],
             "django": true,