Merge pull request #105 from jbellister-slac/update_version

Bump up version numbers
slaclab · Jun 27, 2022 · 938ba34 · 938ba34
2 parents 6020a13 + d593fd7
commit 938ba34
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,15 +1,15 @@
 version: "3.0"
 services:
     zookeeper:
-        image: tidacs/nalms-zookeeper:v1.0
+        image: tidacs/nalms-zookeeper:v1.1
         ports:
             - "2181:2181"
         environment:
             ZOOKEEPER_CONFIG: /tmp/zoo.cfg
         volumes:
             - "./examples/demo/config/zoo.cfg:/tmp/zoo.cfg"
     kafka:
-        image: tidacs/nalms-kafka:v1.0
+        image: tidacs/nalms-kafka:v1.1
         depends_on: 
             - zookeeper
         ports:
@@ -31,7 +31,7 @@ services:
                 reservations:
                     memory: 8G
     kafka1:
-        image: tidacs/nalms-kafka:v1.0
+        image: tidacs/nalms-kafka:v1.1
         depends_on: 
             - zookeeper
         ports:
@@ -53,7 +53,7 @@ services:
                 reservations:
                     memory: 8G
     kafka2:
-        image: tidacs/nalms-kafka:v1.0
+        image: tidacs/nalms-kafka:v1.1
         depends_on: 
             - zookeeper
         ports:
@@ -75,7 +75,7 @@ services:
                 reservations:
                     memory: 8G
     phoebus-alarm-server:
-        image: tidacs/nalms-phoebus-alarm-server:v1.0
+        image: tidacs/nalms-phoebus-alarm-server:v1.1
         links:
             - kafka
             - example-ioc
@@ -93,7 +93,7 @@ services:
             EPICS_CA_REPEATER_PORT: 5065
             ALARM_SERVER_PROPERTIES: "/opt/nalms/config/alarm_server.properties"
     elasticsearch:
-        image: tidacs/nalms-elasticsearch:v1.0
+        image: tidacs/nalms-elasticsearch:v1.1
         ports:
             - "9200:9200"
         volumes:
@@ -108,7 +108,7 @@ services:
             KAFKA_HOST: kafka
             KAFKA_PORT: 9092
     grafana:
-        image: tidacs/nalms-grafana:v1.0
+        image: tidacs/nalms-grafana:v1.1
         ports:
             - '3000:3000'
         links:
@@ -122,7 +122,7 @@ services:
             ES_HOST: elasticsearch
             ES_PORT: 9200
     phoebus-alarm-logger:
-        image: tidacs/nalms-phoebus-alarm-logger:v1.0
+        image: tidacs/nalms-phoebus-alarm-logger:v1.1
         links:
             - elasticsearch
         depends_on:
@@ -139,7 +139,7 @@ services:
             - "./examples/heart_of_gold/config/alarm_logger.properties:/opt/nalms/config/alarm_logger.properties"
         command: start-logger HeartOfGold /tmp/nalms/heart_of_gold.xml
     example-ioc:
-        image: tidacs/nalms-example-ioc:v1.0
+        image: tidacs/nalms-example-ioc:v1.1
         ports:
             - "5075:5065/tcp"
             - "5074:5064/tcp"
@@ -149,7 +149,7 @@ services:
             EPICS_CA_SERVER_PORT: 5064
             EPICS_CA_REPEATER_PORT: 5065
     cruise-control:
-        image: tidacs/nalms-cruise-control:v1.0
+        image: tidacs/nalms-cruise-control:v1.1
         ports: 
             - "9090:9090"
         environment:

diff --git a/docs/development.md b/docs/development.md
@@ -15,13 +15,13 @@ Newer versioned releases should be indicated to the nalms package by updates to
 
 ```
 # versions
-export NALMS_DOCKER_ES_VERSION=v1.0
-export NALMS_DOCKER_GRAFANA_VERSION=v1.0
-export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.0
-export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.0
-export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.0
-export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.0
-export NALMS_DOCKER_KAFKA_VERSION=v1.0
+export NALMS_DOCKER_ES_VERSION=v1.1
+export NALMS_DOCKER_GRAFANA_VERSION=v1.1
+export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.1
+export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.1
+export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.1
+export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.1
+export NALMS_DOCKER_KAFKA_VERSION=v1.1
 ```
 
 

diff --git a/examples/demo/demo.env b/examples/demo/demo.env
@@ -28,10 +28,10 @@ export NALMS_ZOOKEEPER_HOST=$HOST_IP
 export NALMS_KAFKA_HOST=$HOST_IP
 
 # versions
-export NALMS_DOCKER_ES_VERSION=v1.0
-export NALMS_DOCKER_GRAFANA_VERSION=v1.0
-export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.0
-export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.0
-export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.0
-export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.0
-export NALMS_DOCKER_KAFKA_VERSION=v1.0
+export NALMS_DOCKER_ES_VERSION=v1.1
+export NALMS_DOCKER_GRAFANA_VERSION=v1.1
+export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.1
+export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.1
+export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.1
+export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.1
+export NALMS_DOCKER_KAFKA_VERSION=v1.1
diff --git a/examples/heart_of_gold/heart_of_gold.env b/examples/heart_of_gold/heart_of_gold.env
@@ -28,11 +28,11 @@ export NALMS_ZOOKEEPER_HOST=zookeeper
 export NALMS_KAFKA_HOST=kafka1
 
 # versions
-export NALMS_DOCKER_ES_VERSION=v1.0
-export NALMS_DOCKER_GRAFANA_VERSION=v1.0
-export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.0
-export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.0
-export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.0
-export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.0
-export NALMS_DOCKER_KAFKA_VERSION=v1.0
+export NALMS_DOCKER_ES_VERSION=v1.1
+export NALMS_DOCKER_GRAFANA_VERSION=v1.1
+export NALMS_DOCKER_ALARM_SERVER_VERSION=v1.1
+export NALMS_DOCKER_ALARM_LOGGER_VERSION=v1.1
+export NALMS_DOCKER_ZOOKEEPER_VERSION=v1.1
+export NALMS_DOCKER_CRUISE_CONTROL_VERSION=v1.1
+export NALMS_DOCKER_KAFKA_VERSION=v1.1