Final cleanup and v1.9.7 release

Author: johankristianss

Makefile

@@ -2,7 +2,7 @@ all: build
 .PHONY: all build
 
 BUILD_IMAGE ?= colonyos/colonies
-PUSH_IMAGE ?= colonyos/colonies:v1.9.7.beta8
+PUSH_IMAGE ?= colonyos/colonies:v1.9.7
 
 VERSION := $(shell git rev-parse --short HEAD)
 BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ')

docker-compose.yml

@@ -51,7 +51,7 @@ services:
       "
 
   colonies-server:
-    image: colonyos/colonies:v1.9.7.beta8
+    image: colonyos/colonies:v1.9.7
     depends_on:
       - timescaledb
     environment:
@@ -87,7 +87,7 @@ services:
     command: sh -c "colonies server start --initdb --port ${COLONIES_SERVER_PORT} --relayport 25100 --etcdname server1 --etcdhost colonies-server --etcdclientport 23100 --etcdpeerport 24100 --initial-cluster server1=colonies-server:24100:25100:${COLONIES_SERVER_PORT} --etcddatadir /var/colonies/etcd --insecure"
 
   colonies-setup:
-    image: colonyos/colonies:v1.9.6
+    image: colonyos/colonies:v1.9.7
     depends_on:
       - colonies-server
     environment: