add versioning of ops docker compose files, adapt bumpversion conf

.bumpversion.cfg

@@ -6,7 +6,7 @@ parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?
 serialize = 
 	{major}.{minor}.{patch}-{release}.{build}
 	{major}.{minor}.{patch}
-tag_name = release-{new_version}
+tag_name = {new_version}
 
 [bumpversion:part:release]
 optional_value = final
@@ -23,3 +23,7 @@ search = current_version = {current_version}
 [bumpversion:glob:**/Dockerfile]
 search = version="{current_version}"
 replace = version="{new_version}"
+
+[bumpversion:glob:preprocessor/setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"

docker-compose.dem.ops.yml

@@ -7,6 +7,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +49,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +92,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +102,7 @@ services:
         constraints:
           - node.labels.type == internal
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +130,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +140,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0
 networks:
   extnet:
     name: dem-extnet

docker-compose.emg.ops.yml

@@ -7,6 +7,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +49,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +92,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +102,7 @@ services:
         constraints:
           - node.labels.type == internal
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +130,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +140,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0
 networks:
   extnet:
     name: emg-extnet

docker-compose.logging.dev.yml

 version: "3.6"
 services:
+  fluentd:
+    image: registry.gitlab.eox.at/esa/prism/vs/fluentd:dev
   elasticsearch:
     ports:
       - "9200:9200"

docker-compose.logging.ops.yml

 version: "3.6"
 services:
   fluentd:
+    image: registry.gitlab.eox.at/esa/prism/vs/fluentd:1.0.0-rc.0
     deploy:
       placement:
         # this is not strictly required, but feels right
         constraints: [node.role == manager]
-
   elasticsearch:
     environment:
       - bootstrap.memory_lock=true

docker-compose.vhr18.ops.yml

@@ -7,6 +7,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +49,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:1.0.0-rc.0
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +92,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:1.0.0-rc.0
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +102,7 @@ services:
         constraints:
           - node.labels.type == internal      
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:1.0.0-rc.0
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +130,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:1.0.0-rc.0
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +140,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:1.0.0-rc.0
 networks:
   extnet:
     name: vhr18-extnet

preprocessor/setup.py

@@ -6,7 +6,7 @@ long_description = ""
 
 setup(
     name="preprocessor", # Replace with your own username
-    version="0.0.1",
+    version="1.0.0-rc.0",
     author="",
     author_email="",
     description="preprocessor for PVS",