Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version display in docker #2856

Merged
merged 3 commits into from
Sep 14, 2021
Merged

Fix version display in docker #2856

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9204487
Fix version display in docker
Aiee Sep 14, 2021
dd25c49
Merge branch 'master' into fix-version-display
Aiee Sep 14, 2021
d9e91fa
Merge branch 'master' into fix-version-display
yixinglu Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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