diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 99025ab48b1..5a2c1a0c3fa 100644 --- 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 index ec6d2305eb4..feb30e33a51 100644 --- 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 index 75bf3e3984e..39cc470075a 100644 --- 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 index b4ab34f8409..d82f67b46cb 100644 --- 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 index 6ca29687e37..d131dd05cb7 100644 --- 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 index fd696809109..5bb004fb378 100644 --- 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