Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 55782dbd44 | |||
| 72c9cb2e00 | |||
| a610ab5462 | |||
| 969360642a | |||
| 939cc0197d |
@@ -14,11 +14,12 @@ Cmd="docker run"
|
|||||||
Cmd="${Cmd} --pull=always"
|
Cmd="${Cmd} --pull=always"
|
||||||
Cmd="${Cmd} --network=host"
|
Cmd="${Cmd} --network=host"
|
||||||
Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
|
Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
|
||||||
Cmd="${Cmd} --rm"
|
# Cmd="${Cmd} --rm"
|
||||||
Cmd="${Cmd} ${DockerImage}"
|
Cmd="${Cmd} ${DockerImage}"
|
||||||
Cmd="${Cmd} -h ${host}"
|
Cmd="${Cmd} -h ${host}"
|
||||||
Cmd="${Cmd} -d ${date}"
|
Cmd="${Cmd} -d ${date}"
|
||||||
Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
|
# Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
|
||||||
|
Cmd="${Cmd} -s coinbase,bnbspot"
|
||||||
|
|
||||||
echo $Cmd
|
echo $Cmd
|
||||||
eval $Cmd
|
eval $Cmd
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ROOT_DIR=/home/cvtt/prod
|
||||||
|
ADMIN_PORT=7220
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
version: '3.8'
|
||||||
|
|
||||||
|
#==================================================
|
||||||
|
# Relies on the file `.env` content for varables:
|
||||||
|
# ROOT_DIR
|
||||||
|
# JUPYTER_PORT
|
||||||
|
#==================================================
|
||||||
|
services:
|
||||||
|
md_portal:
|
||||||
|
image: cloud21.cvtt.vpn:5500/md_portal:latest
|
||||||
|
network_mode: host
|
||||||
|
container_name: md_portal
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
- JUPYTER_ENABLE_LAB=yes
|
||||||
|
volumes:
|
||||||
|
- ${ROOT_DIR}/logs:/logs
|
||||||
|
ports:
|
||||||
|
- "${ADMIN_PORT}:${ADMIN_PORT}"
|
||||||
|
shm_size: "8gb"
|
||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
args=${*}
|
||||||
|
|
||||||
|
ImageName=md_portal
|
||||||
|
DockerRegistry=cloud21.cvtt.vpn:5500
|
||||||
|
DockerImage=${DockerRegistry}/${ImageName}
|
||||||
|
|
||||||
|
if [ -z ${date} ] ; then
|
||||||
|
date=$(date -d "yesterday" +%Y%m%d)
|
||||||
|
fi
|
||||||
|
|
||||||
|
Cmd="docker run"
|
||||||
|
Cmd="${Cmd} --rm"
|
||||||
|
Cmd="${Cmd} --pull=always"
|
||||||
|
Cmd="${Cmd} --network=host"
|
||||||
|
Cmd="${Cmd} --restart=unless-stopped"
|
||||||
|
Cmd="${Cmd} --name=${ImageName}"
|
||||||
|
Cmd="${Cmd} --volume /home/cvtt/prod/logs:/logs"
|
||||||
|
Cmd="${Cmd} ${DockerImage}"
|
||||||
|
Cmd="${Cmd} ${args}"
|
||||||
|
|
||||||
|
echo $Cmd
|
||||||
|
# eval $Cmd
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
1.3.7
|
1.4.3RC,Release Candidate for md_portal docker
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ fi
|
|||||||
|
|
||||||
echo "${SourceHost} ${SourceUser} ${SourceRootDir}"
|
echo "${SourceHost} ${SourceUser} ${SourceRootDir}"
|
||||||
|
|
||||||
|
|
||||||
SourceFile=$(date -d ${date} "+%Y%m%d.mktdata.db")
|
SourceFile=$(date -d ${date} "+%Y%m%d.mktdata.db")
|
||||||
SourceFileZip="${SourceFile}.gz"
|
SourceFileZip="${SourceFile}.gz"
|
||||||
SourceFilePath=$(date -d ${date} "+${SourceRootDir}/%Y/%m/${SourceFileZip}")
|
SourceFilePath=$(date -d ${date} "+${SourceRootDir}/%Y/%m/${SourceFileZip}")
|
||||||
@@ -85,6 +86,10 @@ TargetDir="/opt/jupyter_gpu/data/crypto_md"
|
|||||||
TargetFile=$(date -d ${date} "+%Y%m%d.mktdata.ohlcv.db")
|
TargetFile=$(date -d ${date} "+%Y%m%d.mktdata.ohlcv.db")
|
||||||
TargetFilePath="${TargetDir}/${TargetFile}"
|
TargetFilePath="${TargetDir}/${TargetFile}"
|
||||||
|
|
||||||
|
# Tables=(bnbfut_ohlcv_1min bnbspot_ohlcv_1min coinbase_ohlcv_1min)
|
||||||
|
Tables=(bnbspot_ohlcv_1min coinbase_ohlcv_1min)
|
||||||
|
|
||||||
|
|
||||||
echo ${SourceFile}
|
echo ${SourceFile}
|
||||||
tmp_dir=$(mktemp -d)
|
tmp_dir=$(mktemp -d)
|
||||||
|
|
||||||
@@ -112,7 +117,7 @@ function download_file {
|
|||||||
rm -f ${TargetFilePath}
|
rm -f ${TargetFilePath}
|
||||||
touch ${TargetFilePath}
|
touch ${TargetFilePath}
|
||||||
|
|
||||||
for table in bnbfut_ohlcv_1min bnbspot_ohlcv_1min coinbase_ohlcv_1min
|
for table in "${Tables[@]}"
|
||||||
do
|
do
|
||||||
Cmd="sqlite3 ${tmp_dir}/${SourceFile} \".dump ${table}\" | sqlite3 ${TargetFilePath}"
|
Cmd="sqlite3 ${tmp_dir}/${SourceFile} \".dump ${table}\" | sqlite3 ${TargetFilePath}"
|
||||||
echo ${Cmd}
|
echo ${Cmd}
|
||||||
|
|||||||
@@ -127,7 +127,8 @@ if [ "${?}" != "0" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
release_version=$(cat release_version.txt)
|
release_version=$(cat release_version.txt | awk -F',' '{print $1}')
|
||||||
|
whats_new=$(cat release_version.txt | awk -F',' '{print $2}')
|
||||||
|
|
||||||
|
|
||||||
echo "--------------------------------"
|
echo "--------------------------------"
|
||||||
@@ -136,7 +137,7 @@ echo "Release version: ${release_version}"
|
|||||||
confirm
|
confirm
|
||||||
|
|
||||||
version_tag="v${release_version}"
|
version_tag="v${release_version}"
|
||||||
version_comment="${version_tag}_${project}_${branch}_$(date +%Y%m%d)"
|
version_comment="'${version_tag} ${project} ${branch} $(date +%Y-%m-%d)\n${whats_new}'"
|
||||||
|
|
||||||
cmd_arr=()
|
cmd_arr=()
|
||||||
Cmd="git tag -a ${version_tag} -m ${version_comment}"
|
Cmd="git tag -a ${version_tag} -m ${version_comment}"
|
||||||
@@ -178,4 +179,8 @@ do
|
|||||||
pwd && echo ${cmd} && eval ${cmd}
|
pwd && echo ${cmd} && eval ${cmd}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo "PROJECT ${project} **** P U L L N E W T A G S F R O M o r i g i n ****"
|
||||||
|
echo "----"
|
||||||
|
echo "(cd ${project}; git pull --tags; git pushall)"
|
||||||
|
echo "----"
|
||||||
echo "$0 Done ${project} ${release_version}"
|
echo "$0 Done ${project} ${release_version}"
|
||||||
|
|||||||
Reference in New Issue
Block a user