fix bugs

Author: zainasir

.env

@@ -2,7 +2,7 @@ DOCKER_IMAGE_CBIOPORTAL=cbioportal/cbioportal:6.3.6
 DOCKER_IMAGE_SESSION_SERVICE=cbioportal/session-service:0.6.4
 DOCKER_IMAGE_MYSQL=mysql:8.0
 DOCKER_IMAGE_CLICKHOUSE=clickhouse/clickhouse-server:24.10
-DOCKER_IMAGE_CLICKHOUSE_IMPORTER=cbioportal/clickhouse-importer:latest
+DOCKER_IMAGE_CLICKHOUSE_IMPORTER=cbioportal/clickhouse-importer:cbioportal-core-v1.0.15
 DB_MYSQL_DB_NAME=cbioportal
 DB_MYSQL_USERNAME=cbio_user
 DB_MYSQL_PASSWORD=somepassword

addon/clickhouse/docker-compose.clickhouse.yml

@@ -4,6 +4,7 @@ services:
   cbioportal:
     depends_on:
       - cbioportal-clickhouse-database
+      - cbioportal-clickhouse-importer
     environment:
       APP_CLICKHOUSE_MODE: true
       APP_SPRING_PROFILE: clickhouse

addon/clickhouse/importer.Dockerfile

@@ -32,7 +32,7 @@ RUN ARCH=$(uname -m) && \
     chmod +x sling && \
     mv sling /usr/local/bin/
 
-# Clone cbioportal-core (locked to a single commit)
+# Clone cbioportal-core
 ARG BRANCH
 RUN \
     mkdir /workdir && \

addon/clickhouse/init.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
+set -eo pipefail
 
 # Set up a working directory
 mkdir -p /workdir && cd /workdir

addon/clickhouse/sync-databases.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
+set -eo pipefail
 
 # Set up a working directory
 cd /workdir