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(chore): remove zgc in dockerfile for ARM env #2421

Merged
merged 11 commits into from
Jan 26, 2024
Merged

fix(chore): remove zgc in dockerfile for ARM env #2421

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c302b5c
remove zgc
aroundabout Jan 19, 2024
46a3d16
Apply suggestions from code review
aroundabout Jan 19, 2024
afeccba
add comment for hugegraph-server.sh
aroundabout Jan 19, 2024
e28e061
fix enable-auth.sh
aroundabout Jan 22, 2024
506b8bd
init store in entrypoint
aroundabout Jan 22, 2024
22f6881
use flag file to skip re-init
aroundabout Jan 22, 2024
f18b113
delete tar.gz
aroundabout Jan 22, 2024
8c97405
simply dockerfile
aroundabout Jan 23, 2024
6909e2d
mvn optimize
aroundabout Jan 23, 2024
ae33076
simply dockerfile
aroundabout Jan 23, 2024
31dd8c6
add init log in docker
aroundabout Jan 24, 2024
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
1 change: 1 addition & 0 deletions hugegraph-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ARG MAVEN_ARGS
RUN mvn package $MAVEN_ARGS -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true && pwd && ls -l

# 2nd stage: runtime env
# remove zgc, which is only available on ARM-Mac with java > 13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems the comment line could be better ↓

FROM openjdk:11-slim
# TODO: get the version from the pom.xml
ENV version=1.2.0
Expand Down
3 changes: 2 additions & 1 deletion hugegraph-server/hugegraph-dist/docker/docker-entrypoint.sh
View file
Open in desktop
aroundabout marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ else
fi

# start hugegraph
./bin/start-hugegraph.sh -j "$JAVA_OPTS" -g zgc
# remove "-g zgc" now, which is only available on ARM-Mac with java > 13
./bin/start-hugegraph.sh -j "$JAVA_OPTS"

tail -f /dev/null
1 change: 1 addition & 0 deletions hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ if [[ $JAVA_VERSION -gt 9 ]]; then
fi

# Using G1GC as the default garbage collector (Recommended for large memory machines)
# mention: zgc is only available on ARM-Mac with java > 13
case "$GC_OPTION" in
g1|G1|g1gc)
echo "Using G1GC as the default garbage collector"
Expand Down
Loading