diff --git a/build.sh b/build.sh index f28b28f..9bf6762 100755 --- a/build.sh +++ b/build.sh @@ -29,14 +29,13 @@ ImageName=${AppName} ImageDir=${HOME}/docker_images mkdir -p ${ImageDir} -TgtImageDir=/home/cvtt/docker_images - +RegistryService=cloud21.cvtt.vpn:5500 Version=$(cat ${RootDir}/cvttpy/release_version.txt) cd ${RootDir} -Cmd="docker build -t ${ImageName} -t ${ImageName}:${Version} -f ${DockerDir}/Dockerfile ." +Cmd="docker build -t ${ImageName} -t ${ImageName}:${Version} -f ${DockerDir}/Dockerfile ." echo ${Cmd} eval ${Cmd} @@ -44,12 +43,11 @@ Cmd="docker save -o ${ImageDir}/${ImageName}.img.tar ${ImageName}" echo ${Cmd} eval ${Cmd} - -Cmd="ssh cvtt@${TgtHostname} \"mkdir -p ${TgtImageDir}\"" +Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest" echo ${Cmd} eval ${Cmd} -Cmd="scp ${ImageDir}/${ImageName}.img.tar cvtt@${TgtHostname}:${TgtImageDir}/" +Cmd="docker push ${RegistryService}/${ImageName}:latest" echo ${Cmd} eval ${Cmd} diff --git a/crypto_md_day/HOWTO.md b/crypto_md_day/HOWTO.md index de899f2..611d30e 100644 --- a/crypto_md_day/HOWTO.md +++ b/crypto_md_day/HOWTO.md @@ -1,15 +1,14 @@ # Build/Dev Host ## Build ```bash -TgtHostname=cryptoval4.cvtt.vpn Version=$(cat /home/oleg/develop/cvtt2/cvttpy/release_version.txt) cd /home/oleg/develop/cvtt2 -docker build -t crypto_md_day -t crypto_md_day${Version} -f docker_dev/crypto_md_day/Dockerfile . +docker build -t crypto_md_day -t crypto_md_day:${Version} -f docker_dev/crypto_md_day/Dockerfile . ## Deploy -/home/oleg/develop/cvtt2/docker_dev/build.sh crypto_md_day cryptoval4.cvtt.vpn +/home/oleg/develop/cvtt2/docker_dev/build.sh crypto_md_day ``` @@ -19,11 +18,13 @@ sudo usermod -a -G docker cvtt ``` **Re-login as cvtt after adding cvtt to the group** +### Clean ```bash docker rm -f crypto_md_day docker images --filter=reference=crypto_md_day --format="{{.ID}}" | uniq | xargs docker rmi -f - -# Test run locally +``` +### Test run locally +``` docker load -i /home/oleg/docker_images/crypto_md_day.img.tar mkdir -p /tmp/data mkdir -p /tmp/logs