From 2e43ba7744a91287535ff7098224395b9c501e53 Mon Sep 17 00:00:00 2001 From: MdSahil-oss Date: Mon, 12 Jun 2023 00:46:50 +0530 Subject: [PATCH 1/3] Added Dockerfile.cs.template file Signed-off-by: MdSahil-oss --- Dockerfile.cs.template | 10 ++++++++++ docker-entrypoint-cs.sh | 1 + 2 files changed, 11 insertions(+) create mode 100644 Dockerfile.cs.template create mode 100644 docker-entrypoint-cs.sh diff --git a/Dockerfile.cs.template b/Dockerfile.cs.template new file mode 100644 index 00000000..fe69b923 --- /dev/null +++ b/Dockerfile.cs.template @@ -0,0 +1,10 @@ +# %%MARIADB_VERSION%% will be set by update.sh according to generating mariadb version image. +FROM mariadb:%%MARIADB_VERSION%% + +RUN apt-get update && \ + apt-get install -y mariadb-plugin-columnstore=$MARIADB_VERSION ; \ + rm -rf /var/lib/apt/lists/* + +COPY docker-entrypoint-cs.sh /usr/local/bin/ + +ENTRYPOINT ["docker-entrypoint-cs.sh"] \ No newline at end of file diff --git a/docker-entrypoint-cs.sh b/docker-entrypoint-cs.sh new file mode 100644 index 00000000..c5d58ad2 --- /dev/null +++ b/docker-entrypoint-cs.sh @@ -0,0 +1 @@ +# Add docker-column-store image related scripts. \ No newline at end of file From ffaa2d8de6371cd63989b936611bba48c6e42950 Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 15 Jun 2023 15:21:31 +0530 Subject: [PATCH 2/3] Added sample docker-entrypoint-cs.sh Signed-off-by: sahil --- docker-entrypoint-cs.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint-cs.sh b/docker-entrypoint-cs.sh index c5d58ad2..7d0e512d 100644 --- a/docker-entrypoint-cs.sh +++ b/docker-entrypoint-cs.sh @@ -1 +1,30 @@ -# Add docker-column-store image related scripts. \ No newline at end of file +#!/bin/bash +set -eo pipefail + +# logging functions +mysql_log() { + local type="$1"; shift + printf '%s [%s] [Entrypoint]: %s\n' "$(date --rfc-3339=seconds)" "$type" "$*" +} +mysql_note() { + mysql_log Note "$@" +} +mysql_warn() { + mysql_log Warn "$@" >&2 +} +mysql_error() { + mysql_log ERROR "$@" >&2 + exit 1 +} + +_main() { + if [ "$1" = 'mariadbd' ]; then + # simply start maridb with column-store + elif [ "$1" = 'StorageManager' ]; then + # Run StorageManage of column-store + elif [ "$1" = 'brm' ]; then + # Run brm + fi +} + +_main "$@" \ No newline at end of file From 08f1f27bc22b7d5ac984dfc2902d1149f0a11c47 Mon Sep 17 00:00:00 2001 From: sahil Date: Fri, 16 Jun 2023 15:02:40 +0530 Subject: [PATCH 3/3] Added mariad functionality Signed-off-by: sahil --- docker-entrypoint-cs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-entrypoint-cs.sh b/docker-entrypoint-cs.sh index 7d0e512d..057c295b 100644 --- a/docker-entrypoint-cs.sh +++ b/docker-entrypoint-cs.sh @@ -20,6 +20,7 @@ mysql_error() { _main() { if [ "$1" = 'mariadbd' ]; then # simply start maridb with column-store + exec docker-entrypoint.sh "$@" elif [ "$1" = 'StorageManager' ]; then # Run StorageManage of column-store elif [ "$1" = 'brm' ]; then @@ -27,4 +28,5 @@ _main() { fi } +# Runs _main() function. _main "$@" \ No newline at end of file