Makefile

@@ -14,10 +14,10 @@ django:
 	docker build . -t mumui:local
 
 pushpin-local:
-	cd pushpin && docker build . -t pushpin:mumui
+	cd pushpin && docker build . -t pushpin:local
 
 nginx-local:
-	cd nginx && docker build . -t nginx:mumui
+	cd nginx && docker build . -t nginx:local
 
 build:
 	$(MAKE) pushpin-local

deployment/urls.py

@@ -4,7 +4,7 @@ from django.urls import path, include
 from deployment.views import index, create, details, deploy, abort
 
 urlpatterns = [
-    path("", index, name="deployments"),
+    path("", index, name="deployment"),
     path("create", create, name="deployment-create"),
     path("<uuid:deployment_id>", details, name="deployment-details"),
     path("<uuid:deployment_id>/deploy", deploy, name="deployment-launch"),
@@ -13,7 +13,7 @@ urlpatterns = [
         "events/<user_id>/",
         include(django_eventstream.urls),
         {"format-channels": ["deployment_{user_id}"]},
-        name="deployments-events",
+        name="deployment-events",
     ),
     path(
         "events/<user_id>/<deployment_id>/",

deployment/views.py

@@ -71,9 +71,9 @@ def deploy(request, deployment_id):
         launch_deploy.delay(deployment_id)
 
     if page := request.GET.get("page", ""):
-        return HttpResponseRedirect(f"/deployments?page={page}")
+        return HttpResponseRedirect(f"/deployment?page={page}")
 
-    return HttpResponseRedirect("/deployments")
+    return HttpResponseRedirect("/deployment")
 
 
 def abort(request, deployment_id):
@@ -95,7 +95,7 @@ def abort(request, deployment_id):
         Event.send_details(deployment, progress)
         Event.send(deployment)
 
-    return HttpResponseRedirect(f"/deployments/{deployment.id}")
+    return HttpResponseRedirect(f"/deployment/{deployment.id}")
 
 
 def details(request, deployment_id):
@@ -116,7 +116,7 @@ def details(request, deployment_id):
             deployment.delete()
         except Exception as e:
             return HttpResponseServerError(e)
-        return HttpResponseRedirect("/deployments")
+        return HttpResponseRedirect("/deployment")
 
     return render(
         request,
@@ -145,4 +145,4 @@ def create(request):
         except Exception as e:
             return HttpResponseServerError(e)
 
-    return HttpResponseRedirect("/deployments")
+    return HttpResponseRedirect("/deployment")

docker-compose.yml

@@ -2,15 +2,15 @@ version: '3'
 services:
   redis:
     image: redis/redis-stack-server:latest
-    container_name: redis-mumui
+    container_name: redis
     networks:
       - mumui_network
     volumes:
       - redis_data:/data
 
   pushpin:
-    image: pushpin:mumui
-    container_name: pushpin-mumui
+    image: pushpin:local
+    container_name: pushpin
     networks:
       - mumui_network
     depends_on:
@@ -18,7 +18,7 @@ services:
 
   postgres:
     image: postgres:latest
-    container_name: postgres-mumui
+    container_name: postgres
     env_file:
       - .env
     networks:
@@ -39,8 +39,8 @@ services:
       - postgres
 
   nginx:
-    image: nginx:mumui
-    container_name: nginx-mumui
+    image: nginx:local
+    container_name: nginx
     networks:
       - mumui_network
     volumes:

mumui/urls.py

@@ -21,6 +21,6 @@ from django.views.generic.base import TemplateView
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("accounts/", include("django.contrib.auth.urls")),
-    path("deployments/", include("deployment.urls")),
+    path("deployment/", include("deployment.urls")),
     path("", TemplateView.as_view(template_name="home.html"), name="home"),
 ]

templates/deployment/details.html

@@ -92,7 +92,7 @@
     {% endif %}
     <script>
         function goBack() {
-            window.location={% url 'deployments' %};
+            window.location={% url 'deployment' %};
         }
     </script>
 {% endblock %}

templates/header.html

@@ -15,7 +15,7 @@
                         <a class="nav-link" href="/">Home</a>
                     </li>
                     <li class="nav-item">
-                        <a href="{% url 'deployments' %}" class="nav-link">Deployments</a></li>
+                        <a href="{% url 'deployment' %}" class="nav-link">Deployments</a></li>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#">About</a></li>

templates/home.html

@@ -13,7 +13,7 @@
             <div class="row justify-content-md-center">
                 <div class="col-lg-6 col-md-8 col-sm-8">
                     <div style="text-align: center;">Forget, i don't care... Please go on 
-                        <a href="{% url 'deployments' %}">Deployments</a> 
+                        <a href="{% url 'deployment' %}">Deployments</a> 
                         and enjoy the life !
                     </div>
                 </div>