Hotfixes into unstable

.github/workflows/containerbuild.yml

@@ -79,7 +79,7 @@ jobs:
         with:
           skip_after_successful_duplicate: false
           github_token: ${{ github.token }}
-          paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
+          paths: '["docker/Dockerfile.nginx.prod", "docker/nginx/*", ".github/workflows/containerbuild.yml"]'
 
   build_nginx:
     name: nginx - test build of nginx Docker image
@@ -100,6 +100,6 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ./
-        file: ./k8s/images/nginx/Dockerfile
+        file: ./docker/Dockerfile.nginx.prod
         platforms: linux/amd64
         push: false

Makefile

@@ -171,11 +171,7 @@ dcbuild:
 	$(DOCKER_COMPOSE) build
 
 dcup: .docker/minio .docker/postgres
-	# run all services except for cloudprober
-	$(DOCKER_COMPOSE) up studio-app celery-worker
-
-dcup-cloudprober: .docker/minio .docker/postgres
-	# run all services including cloudprober
+	# run all services
 	$(DOCKER_COMPOSE) up
 
 dcdown:

contentcuration/contentcuration/frontend/accounts/pages/Create.vue

@@ -213,9 +213,10 @@
         <KButton
           primary
           class="mt-5"
-          :disabled="offline"
+          :disabled="offline || submitting"
           :text="$tr('finishButton')"
           type="submit"
+          data-test="submit-button"
         />
       </VForm>
     </VLayout>
@@ -260,6 +261,7 @@
       return {
         valid: true,
         registrationFailed: false,
+        submitting: false,
         form: {
           first_name: '',
           last_name: '',
@@ -482,6 +484,12 @@
         // We need to check the "acceptedAgreement" here explicitly because it is not a
         // Vuetify form field and does not trigger the form validation.
         if (this.$refs.form.validate() && this.acceptedAgreement) {
+          // Prevent double submission
+          if (this.submitting) {
+            return Promise.resolve();
+          }
+
+          this.submitting = true;
           const cleanedData = this.clean(this.form);
           return this.register(cleanedData)
             .then(() => {
@@ -517,6 +525,9 @@
                 this.registrationFailed = true;
                 this.valid = false;
               }
+            })
+            .finally(() => {
+              this.submitting = false;
             });
         } else if (this.$refs.top.scrollIntoView) {
           this.$refs.top.scrollIntoView({ behavior: 'smooth' });

contentcuration/contentcuration/frontend/accounts/pages/__tests__/create.spec.js

@@ -179,4 +179,19 @@ describe('create', () => {
       expect(wrapper.vm.registrationFailed).toBe(true);
     });
   });
+  describe('double-submit prevention', () => {
+    it('should prevent multiple API calls on rapid clicks', async () => {
+      const [wrapper, mocks] = await makeWrapper();
+
+      // Click submit multiple times
+      const p1 = wrapper.vm.submit();
+      const p2 = wrapper.vm.submit();
+      const p3 = wrapper.vm.submit();
+
+      await Promise.all([p1, p2, p3]);
+
+      // Only 1 API call should be made
+      expect(mocks.register).toHaveBeenCalledTimes(1);
+    });
+  });
 });

contentcuration/contentcuration/settings.py

@@ -348,6 +348,11 @@ def gettext(s):
     "result_serializer": "json",
     "result_extended": True,
     "worker_send_task_events": True,
+    # Graceful shutdown: allow 28 seconds for tasks to complete before forced termination
+    # This is 2 seconds less than Kubernetes terminationGracePeriodSeconds (30s)
+    "worker_soft_shutdown_timeout": int(
+        os.getenv("CELERY_WORKER_SOFT_SHUTDOWN_TIMEOUT", "28")
+    ),
 }
 
 # When cleaning up orphan nodes, only clean up any that have been last modified

contentcuration/contentcuration/tests/views/test_users.py

@@ -1,11 +1,13 @@
 import json
 
+from django.db import IntegrityError
 from django.http.response import HttpResponseBadRequest
 from django.http.response import HttpResponseForbidden
 from django.http.response import HttpResponseNotAllowed
 from django.http.response import HttpResponseRedirectBase
 from django.urls import reverse_lazy
 from mock import mock
+from mock import patch
 
 from contentcuration.models import User
 from contentcuration.tests import testdata
@@ -127,8 +129,8 @@ def setUp(self):
             first_name="Tester",
             last_name="Tester",
             email="[email protected]",
-            pasword1="tester123",
-            pasword2="tester123",
+            password1="tester123",
+            password2="tester123",
             uses="IDK",
             source="IDK",
             policies=json.dumps(dict(policy_etc=True)),
@@ -148,8 +150,8 @@ def test_post__inactive_registration(self):
         self.assertIsInstance(response, HttpResponseNotAllowed)
 
     def test_post__password_too_short(self):
-        self.request_data["pasword1"] = "123"
-        self.request_data["pasword2"] = "123"
+        self.request_data["password1"] = "123"
+        self.request_data["password2"] = "123"
         response = self.post(self.view, self.request_data)
         self.assertIsInstance(response, HttpResponseBadRequest)
         self.assertIn("password1", response.content.decode())
@@ -160,6 +162,22 @@ def test_post__after_delete(self):
         response = self.post(self.view, self.request_data)
         self.assertIsInstance(response, HttpResponseForbidden)
 
+    @patch("contentcuration.views.users.UserRegistrationView.register")
+    def test_post__handles_integrity_error_gracefully(self, mock_register):
+        """Test that IntegrityError during registration returns 403 instead of 500"""
+        # Simulate IntegrityError (race condition on duplicate email)
+        mock_register.side_effect = IntegrityError(
+            'duplicate key value violates unique constraint "contentcuration_user_email_key"'
+        )
+
+        response = self.post(self.view, self.request_data)
+
+        # Should return 403 Forbidden, not 500
+        self.assertIsInstance(response, HttpResponseForbidden)
+        # Error response should include "email" field
+        error_data = json.loads(response.content.decode())
+        self.assertIn("email", error_data)
+
 
 class UserActivationViewTestCase(StudioAPITestCase):
     def setUp(self):