diff --git a/.env b/.env index 728df0ad1..1f83fe21c 100644 --- a/.env +++ b/.env @@ -45,6 +45,7 @@ SPARKD__QUICKBUS_PORT=8001 SPARKD__SIM_FIX_PORT=8002 SPARKD__SHM_SIZE=4gb SPARKD__PYTHON_REQUIREMENTS=requirements.txt +SPARKD__ENTRYPOINT=src/app_sparkd/sparkd-entrypoint.sh ### PubSubServer ### PUBSUB__CONFIG_DIR=src/DataStreamSuite/PubSubServer/Configurations/Development diff --git a/compose.yaml b/compose.yaml index 5a0e2b9a2..d1c779ec9 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,24 +9,8 @@ services: - SOURCE_DIR=${SPARKD__SOURCE_DIR} - CONFIG_DIR=${SPARKD__CONFIG_DIR} - PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS} + - ENTRYPOINT_SCRIPT=${SPARKD__ENTRYPOINT} shm_size: "${SPARKD__SHM_SIZE:-512mb}" - command: > - sh -c " - echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd/data - if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then - mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')" - fi - if [ -e "/home/bts/.local/share/bts/sparkd/conf/.env.local" ]; then - echo 'Sourcing /home/bts/.local/share/bts/sparkd/conf/.env.local' - set -a - . /home/bts/.local/share/bts/sparkd/conf/.env.local - set +a - fi - if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then - echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)' - cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/ - fi - ./sparkd run" env_file: - .env - ${SPARKD__CONFIG_DIR}/.env @@ -50,26 +34,8 @@ services: - SOURCE_DIR=${SPARKD__SOURCE_DIR} - CONFIG_DIR=${SPARKD__CONFIG_DIR} - PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS} + - ENTRYPOINT_SCRIPT=${SPARKD__ENTRYPOINT} shm_size: "${SPARKD__SHM_SIZE:-512mb}" - command: > - sh -c " - echo bts | sudo -S chown -R bts:bts /home/bts/.local/share/bts/sparkd - if [ -e "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" ]; then - mv "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log" "/home/bts/.local/share/bts/sparkd/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')" - fi - ls -alh /home/bts/.local/share/bts/sparkd/conf/ - cat /home/bts/.local/share/bts/sparkd/conf/.env.local - if [ -e "/home/bts/.local/share/bts/sparkd/conf/.env.local" ]; then - echo 'Sourcing /home/bts/.local/share/bts/sparkd/conf/.env.local' - set -a - . /home/bts/.local/share/bts/sparkd/conf/.env.local - set +a - fi - if [ -d /home/bts/.local/share/bts/sparkd/conf/plugins ]; then - echo 'Copying /home/bts/.local/share/bts/sparkd/conf/plugins to runtime dir (/home/bts/bin)' - cp -r /home/bts/.local/share/bts/sparkd/conf/plugins /home/bts/bin/ - fi - ./sparkd run" env_file: - .env - ${SPARKD__CONFIG_DIR}/.env diff --git a/src/app_sparkd/Dockerfile b/src/app_sparkd/Dockerfile index c47320f5e..c57d203e1 100644 --- a/src/app_sparkd/Dockerfile +++ b/src/app_sparkd/Dockerfile @@ -2,12 +2,14 @@ ARG IMAGE="sparkd" ARG CONFIG_DIR="src/app_sparkd/configurations/dev" ARG SOURCE_DIR="install/sparkd-release-gcc" ARG PYTHON_REQUIREMENTS="requirements.txt" +ARG ENTRYPOINT_SCRIPT="src/app_sparkd/sparkd-entrypoint.sh" # sparkd_base FROM bluetradingsystems/linux_dotnet8 AS sparkd_base ARG CONFIG_DIR ARG SOURCE_DIR ARG PYTHON_REQUIREMENTS +ARG ENTRYPOINT_SCRIPT USER "root" RUN apt-get update && apt-get install -y liblttng-ust-dev @@ -21,6 +23,7 @@ RUN pip3 install -r "/home/bts/bin/requirements.txt" USER "bts" COPY --chown=bts:bts "${SOURCE_DIR}" "." COPY --chown=bts:bts "${CONFIG_DIR}" "/home/bts/.local/share/bts/sparkd/conf" +COPY --chown=bts:bts "${ENTRYPOINT_SCRIPT}" "/home/bts/bin/sparkd-entrypoint.sh" WORKDIR "/home/bts/bin" # sparkd @@ -35,6 +38,7 @@ COPY --chown=bts:bts "${MD_RECORDING_DIR}" "/home/bts/.local/share/bts/sparkd/da FROM bluetradingsystems/linux_dotnet8 AS sparkd_symbols ARG SOURCE_DIR ARG PYTHON_REQUIREMENTS="requirements.txt" +ARG ENTRYPOINT_SCRIPT USER "root" RUN apt-get update && apt-get install -y liblttng-ust-dev @@ -47,7 +51,9 @@ RUN pip3 install -r "/home/bts/bin/requirements.txt" USER "bts" COPY --chown=bts:bts "${SOURCE_DIR}" "." +COPY --chown=bts:bts "${ENTRYPOINT_SCRIPT}" "/home/bts/bin/sparkd-entrypoint.sh" WORKDIR "/home/bts/bin" # selected image FROM ${IMAGE} +ENTRYPOINT "./sparkd-entrypoint.sh" diff --git a/src/app_sparkd/sparkd-entrypoint.sh b/src/app_sparkd/sparkd-entrypoint.sh new file mode 100755 index 000000000..66c315a56 --- /dev/null +++ b/src/app_sparkd/sparkd-entrypoint.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +load_env() { + f="$1" + if [ -e "$f" ]; then + echo "Sourcing $f" + set -a + . "$f" + set +a + fi +} + +symlink() { + src="$1" + dst="$2" + if [ -L "$dst" ]; then + rm "$dst" + fi + ln -s "$src" "$dst" +} + +roll_log() { + f="$1" + if [ -e "$f" ]; then + mv "$f" "${f}_$(date '+%Y%m%d-%H%M')" + fi +} + +data_root="${HOME:-/home/bts}/.local/share/bts/sparkd" +echo bts | sudo -S chown -R bts:bts "$data_root" +load_env "$data_root/conf/.env.local" +roll_log "$data_root/data/logging.sparkd/log" +symlink "$data_root/conf/plugins" /home/bts/bin/plugins +bash -c "${@:-./sparkd run}"