Split mapcache & mapserver Docker repos

Instead of sharing a repository, make each of them have its own. See #721
instedd · Mar 12, 2024 · 45e9ac1 · 45e9ac1
1 parent 62a817b
commit 45e9ac1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 27 deletions.
diff --git a/build.sh b/build.sh
@@ -13,6 +13,6 @@ if [[ -z "$DOCKER_TAG" ]]; then
 fi
 
 dockerBuildAndPush
-dockerBuildAndPush -d mapserver -s "-mapserver" -t "-mapserver" -o "-f mapserver/Dockerfile.mapserver"
-dockerBuildAndPush -d mapserver -s "-mapserver" -t "-mapcache" -o "-f mapserver/Dockerfile.mapcache"
+dockerBuildAndPush -d mapserver -s "-mapserver" -o "-f mapserver/Dockerfile.mapserver"
+dockerBuildAndPush -d mapserver -s "-mapcache" -o "-f mapserver/Dockerfile.mapcache"
 dockerBuildAndPush -d scripts -s "-tools"
diff --git a/docker-cloud.sample.yml b/docker-cloud.sample.yml
@@ -21,12 +21,12 @@ web:
     - mapserver-data
 
 mapcache:
-  image: instedd/planwise-mapserver:kenya-mapcache
+  image: instedd/planwise-mapcache:kenya
   autorestart: always
   autoredeploy: true
 
 mapserver:
-  image: instedd/planwise-mapserver:kenya-mapserver
+  image: instedd/planwise-mapserver:kenya
   autorestart: always
   autoredeploy: true
   volumes_from:

diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -34,12 +34,12 @@ services:
 
   mapcache:
     container_name: planwise-prod-mapcache
-    image: instedd/planwise-mapserver:kenya-mapcache
+    image: instedd/planwise-mapcache:kenya
     pid: host
 
   mapserver:
     container_name: planwise-prod-mapserver
-    image: instedd/planwise-mapserver:kenya-mapserver
+    image: instedd/planwise-mapserver:kenya
     pid: host
     volumes:
       - data:/data

diff --git a/mapserver/build-and-push.sh b/mapserver/build-and-push.sh
diff --git a/mapserver/docker-compose.yml b/mapserver/docker-compose.yml
@@ -1,5 +1,5 @@
 mapcache:
-  image: instedd/planwise-mapserver:mapcache
+  image: instedd/planwise-mapcache
   # build: .
   # dockerfile: Dockerfile.mapcache
   volumes:
@@ -10,7 +10,7 @@ mapcache:
     - "5002:80"
 
 mapserver:
-  image: instedd/planwise-mapserver:mapserver
+  image: instedd/planwise-mapserver
   # build: .
   # dockerfile: Dockerfile.mapserver
   volumes: