Skip to content

Commit

Permalink
Fix version display in docker (vesoft-inc#80)
Browse files Browse the repository at this point in the history
Co-authored-by: Aiee <[email protected]>
  • Loading branch information
nebula-bots and Aiee authored Sep 15, 2021
1 parent ceeefe4 commit 788caae
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BRANCH=master
COPY . /home/nebula/BUILD

RUN cd /home/nebula/BUILD/package \
&& ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
&& ./package.sh -n OFF -b ${BRANCH}

FROM centos:7 as graphd

Expand All @@ -15,8 +15,8 @@ COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-graph.rpm
WORKDIR /usr/local/nebula

RUN rpm -ivh *.rpm \
&& mkdir -p ./{logs,data,pids} \
&& rm -rf *.rpm
&& mkdir -p ./{logs,data,pids} \
&& rm -rf *.rpm

EXPOSE 9669 19669 19670

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.graphd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY . /home/nebula/BUILD
ARG BRANCH=master

RUN cd /home/nebula/BUILD/package \
&& ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH} -g OFF
&& ./package.sh -n OFF -b ${BRANCH} -g OFF

FROM centos:7

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.metad
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BRANCH=master
COPY . /home/nebula/BUILD

RUN cd /home/nebula/BUILD/package \
&& ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
&& ./package.sh -n OFF -b ${BRANCH}

FROM centos:7

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.storaged
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BRANCH=master
COPY . /home/nebula/BUILD

RUN cd /home/nebula/BUILD/package \
&& ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
&& ./package.sh -n OFF -b ${BRANCH}

FROM centos:7

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG BRANCH=master
COPY . /home/nebula/BUILD

RUN cd /home/nebula/BUILD/package \
&& ./package.sh -v $(git rev-parse --short HEAD) -n OFF -b ${BRANCH}
&& ./package.sh -n OFF -b ${BRANCH}

FROM centos:7

Expand Down
2 changes: 1 addition & 1 deletion package/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Package nebula as deb/rpm package
#
# introduce the args
# -v: The version of package, the version should be match tag name, default value is the `commitId`
# -v: The version of package, the version should be match tag name, default value is null
# -n: Package to one or multi-packages, `ON` means one package, `OFF` means multi packages, default value is `ON`
# -s: Whether to strip the package, default value is `FALSE`
# -b: Branch, default master
Expand Down

0 comments on commit 788caae

Please sign in to comment.