fix docker image version （typo） (#4087) (#4090)

* fix docker image version * fix package command Co-authored-by: HarrisChu <[email protected]> Co-authored-by: Sophie <[email protected]>
vesoft-inc · Mar 28, 2022 · 4805f8c · 4805f8c
1 parent 4ac72f1
commit 4805f8c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -107,7 +107,7 @@ jobs:
           push: true
           build-args: |
             BRANCH=${{ steps.tagname.outputs.tag }}
-            VERSON=${{ steps.tagname.outputs.tagnum }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
 
   test:
     name: test

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,8 +6,8 @@ ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -n OFF -b ${BRANCH}
-
+  && ./package.sh -n OFF -v "${VERSION}" -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+  
 FROM centos:7 as graphd
 
 COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-common.rpm /usr/local/nebula/nebula-common.rpm

diff --git a/docker/Dockerfile.graphd b/docker/Dockerfile.graphd
@@ -6,9 +6,7 @@ ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && [[ -z "${VERSION}" ]] \
-  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
-  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+  && ./package.sh -n OFF -v "${VERSION}" -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.metad b/docker/Dockerfile.metad
@@ -6,9 +6,7 @@ ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && [[ -z "${VERSION}" ]] \
-  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
-  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+  && ./package.sh -n OFF -v "${VERSION}" -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.storaged b/docker/Dockerfile.storaged
@@ -6,9 +6,7 @@ ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && [[ -z "${VERSION}" ]] \
-  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
-  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+  && ./package.sh -n OFF -v "${VERSION}" -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
 
 FROM centos:7
 

diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
@@ -6,9 +6,7 @@ ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && [[ -z "${VERSION}" ]] \
-  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
-  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+  && ./package.sh -n OFF -v "${VERSION}" -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
 
 FROM centos:7