From 15bbf2f7d1f3b050906af0632fe18a3cf10d2c06 Mon Sep 17 00:00:00 2001
From: Matthew Grove <me@mgrove.uk>
Date: Thu, 5 Jan 2023 17:56:04 +0000
Subject: [PATCH] [BUILD] Change docker image & container names

---
 Caddyfile                              | 2 +-
 deploy/templates/Caddyfile.j2          | 2 +-
 deploy/templates/docker-compose.yml.j2 | 8 +++++---
 docker-compose.yml                     | 8 +++++---
 4 files changed, 12 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 Caddyfile
 mode change 100644 => 100755 deploy/templates/Caddyfile.j2
 mode change 100644 => 100755 deploy/templates/docker-compose.yml.j2

diff --git a/Caddyfile b/Caddyfile
old mode 100644
new mode 100755
index 2e77277..d5cc982
--- a/Caddyfile
+++ b/Caddyfile
@@ -6,7 +6,7 @@
         not path /static/*
     }
 
-    reverse_proxy @proxy_paths http://web:8000
+    reverse_proxy @proxy_paths http://server:8000
 
     log {
         output stderr
diff --git a/deploy/templates/Caddyfile.j2 b/deploy/templates/Caddyfile.j2
old mode 100644
new mode 100755
index f407511..a5449da
--- a/deploy/templates/Caddyfile.j2
+++ b/deploy/templates/Caddyfile.j2
@@ -6,7 +6,7 @@ http://* {
         not path /static/*
     }
 
-    reverse_proxy @proxy_paths http://web:8000
+    reverse_proxy @proxy_paths http://server:8000
 
     log {
         output stderr
diff --git a/deploy/templates/docker-compose.yml.j2 b/deploy/templates/docker-compose.yml.j2
old mode 100644
new mode 100755
index 08d51ee..122d2a2
--- a/deploy/templates/docker-compose.yml.j2
+++ b/deploy/templates/docker-compose.yml.j2
@@ -1,8 +1,9 @@
 version: '3.1'
 
 services:
-  web:
-    image: breccia-mapper
+  server:
+    image: breccia-relationship-mapper
+    container_name: relationship-mapper-server
     build: {{ project_src_dir }}
     ports:
       - 8000:8000
@@ -16,6 +17,7 @@ services:
 
   caddy:
     image: caddy:2
+    container_name: relationship-mapper-caddy
     restart: unless-stopped
     ports:
       - 80:80
@@ -27,7 +29,7 @@ services:
       - caddy_data:/data
       - caddy_config:/config
     depends_on:
-      - web
+      - server
 
 volumes:
   caddy_data:
diff --git a/docker-compose.yml b/docker-compose.yml
index c2331f0..afe24f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
 version: '3.1'
 
 services:
-  web:
-    image: breccia-mapper
+  server:
+    image: breccia-relationship-mapper
+    container_name: relationship-mapper-server
     build: .
     ports:
       - 8000:8000
@@ -16,6 +17,7 @@ services:
 
   caddy:
     image: caddy:2
+    container_name: relationship-mapper-caddy
     restart: unless-stopped
     ports:
       - 80:80
@@ -27,7 +29,7 @@ services:
       - caddy_data:/data
       - caddy_config:/config
     depends_on:
-      - web
+      - server
 
 volumes:
   caddy_data: