Bug/version bump in docker up.sh (#2129)

* Bump version in .env.example

Signed-off-by: wslulciuc <willy@datakin.com>

* Remove version bump of docker/up.sh in new-version.sh

Signed-off-by: wslulciuc <willy@datakin.com>

* Use VERSION in docker/up.sh

Signed-off-by: wslulciuc <willy@datakin.com>

* Add version bump via VERSION

Signed-off-by: wslulciuc <willy@datakin.com>

* continued: Add version bump via VERSION

Signed-off-by: wslulciuc <willy@datakin.com>

* Fix version bump for docker/up.sh and .env.example

Signed-off-by: wslulciuc <willy@datakin.com>

* Revert version bump for psql

Signed-off-by: wslulciuc <willy@datakin.com>

Signed-off-by: wslulciuc <willy@datakin.com>

Author: wslulciuc

.env.example

@@ -1,4 +1,4 @@
 API_PORT=5000
 API_ADMIN_PORT=5001
 WEB_PORT=3000
-TAG=0.19.0
+TAG=0.26.0

chart/values.yaml

@@ -107,7 +107,7 @@ postgresql:
   ## @param image.tag PostgreSQL image tag (immutable tags are recommended)
   ##
   image:
-    tag: 0.26.0
+    tag: 12.1.0
   ## Authentication parameters
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
   ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run

docker/up.sh

@@ -5,7 +5,8 @@
 
 set -e
 
-SCRIPTDIR=$(dirname $0)
+VERSION=0.26.0
+DOCKER_DIR=$(dirname $0)
 
 title() {
   echo -e "\033[1m${1}\033[0m"
@@ -35,7 +36,7 @@ usage() {
   echo "  -a, --api-port int          api port (default: 5000)"
   echo "  -m, --api-admin-port int    api admin port (default: 5001)"
   echo "  -w, --web-port int          web port (default: 3000)"
-  echo "  -t, --tag string            image tag (default: latest)"
+  echo "  -t, --tag string            image tag (default: ${VERSION})"
   echo
   title "FLAGS:"
   echo "  -b, --build           build images from source"
@@ -55,7 +56,7 @@ args="-V --force-recreate --remove-orphans"
 API_PORT=5000
 API_ADMIN_PORT=5001
 WEB_PORT=3000
-TAG=0.19.0
+TAG=${VERSION}
 while [ $# -gt 0 ]; do
   case $1 in
     -a|'--api-port')
@@ -107,6 +108,6 @@ if [[ "${SEED}" = "true" ]]; then
   compose_files+=" -f docker-compose.seed.yml"
 fi
 
-$SCRIPTDIR/volumes.sh marquez
+${DOCKER_DIR}/volumes.sh marquez
 
-API_PORT=${API_PORT} API_ADMIN_PORT=${API_ADMIN_PORT} WEB_PORT=${WEB_PORT} TAG="${TAG}" docker-compose $compose_files up $args
+API_PORT=${API_PORT} API_ADMIN_PORT=${API_ADMIN_PORT} WEB_PORT=${WEB_PORT} TAG=${TAG} docker-compose $compose_files up $args

new-version.sh

@@ -130,8 +130,8 @@ sed -i "" "s/^version:.*/version: ${RELEASE_VERSION}/g" ./chart/Chart.yaml
 sed -i "" "s/tag:.*/tag: ${RELEASE_VERSION}/g" ./chart/values.yaml
 
 # (3) Bump version in scripts
-sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" ./docker/up.sh
-sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" .env.example
+sed -i "" "s/VERSION=.*/VERSION=${RELEASE_VERSION}/g" ./docker/up.sh
+sed -i "" "s/TAG=.*/TAG=${RELEASE_VERSION}/g" .env.example
 
 # (4) Bump version in docs
 sed -i "" "s/^  version:.*/  version: ${RELEASE_VERSION}/g" ./spec/openapi.yml