From f4dac146dcfae8276cf98aaf1e76b58336b67bde Mon Sep 17 00:00:00 2001
From: liu0x54 <tliu@taosdata.com>
Date: Wed, 12 Feb 2020 14:23:15 +0800
Subject: [PATCH] modify the dockerfile and docker build script to adapt the
 change of software release script

---
 packaging/docker/Dockerfile     |  2 +-
 packaging/docker/dockerbuild.sh | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index b01f375db0..22c1bc1902 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /root
 
 COPY tdengine.tar.gz /root/
 RUN tar -zxf tdengine.tar.gz
-WORKDIR /root/tdengine/
+WORKDIR /root/TDengine-server/
 RUN sh install.sh
 
 
diff --git a/packaging/docker/dockerbuild.sh b/packaging/docker/dockerbuild.sh
index 280c27d7aa..aeea6a2a95 100755
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
@@ -1,12 +1,6 @@
 #!/bin/bash
 set -x
 $1
-tar -zxf $1
-DIR=`echo $1|awk -F . '{print($1"."$2"."$3"."$4)}'`
-mv $DIR tdengine
-tar -czf tdengine.tar.gz tdengine
-TMP=`echo $1|awk -F . '{print($2"."$3"."$4)}'`
-TAG="1."$TMP
-docker build --rm -f "Dockerfile" -t tdengine/tdengine:$TAG "."
+docker build --rm -f "Dockerfile" -t tdengine/tdengine:$1 "."
 docker login -u tdengine -p ********  #replace the docker registry username and password
-docker push tdengine/tdengine:$TAG
\ No newline at end of file
+docker push tdengine/tdengine:$1
\ No newline at end of file
-- 
GitLab