feature: dockerfile support arm64 #4802
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #4802 +/- ##
=============================================
- Coverage 48.64% 48.63% -0.01%
+ Complexity 4075 4073 -2
=============================================
Files 736 736
Lines 25720 25720
Branches 3177 3177
=============================================
- Hits 12511 12510 -1
Misses 11865 11865
- Partials 1344 1345 +1
|
slievrly
reviewed
Jul 22, 2022
distribution/Dockerfile
Outdated
| ENV EXTRA_JVM_ARGUMENTS="-Djava.security.egd=file:/dev/./urandom -server -Xss512k -XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport XX:SurvivorRatio=10 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:MaxDirectMemorySize=1024m -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy -XX:+HeapDumpOnOutOfMemoryError -XX:+DisableExplicitGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75 -Xloggc:/var/log/seata_gc.log -verbose:gc -Dio.netty.leakDetectionLevel=advanced" | ||
|
|
||
| CMD ["sh","/seata-server/bin/seata-server.sh"] | ||
| ENV EXTRA_JVM_ARGUMENTS="-Djava.security.egd=file:/dev/./urandom -server -Xss512k -XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport XX:SurvivorRatio=10 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:MaxDirectMemorySize=1024m -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy -XX:+HeapDumpOnOutOfMemoryError -XX:+DisableExplicitGC -Xloggc:/var/log/seata_gc.log -verbose:gc -Dio.netty.leakDetectionLevel=advanced" |
There was a problem hiding this comment.
need to delete the duplicate with the startup script
slievrly
reviewed
Jul 22, 2022
distribution/bin/seata-server.sh
Outdated
| @@ -150,5 +151,10 @@ CMD_LINE_ARGS=$@ | |||
|
|
|||
| # start | |||
| echo "$JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS}" > ${BASEDIR}/logs/start.out 2>&1 & | |||
| nohup $JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS} >> ${BASEDIR}/logs/start.out 2>&1 & | |||
| IN_DOCKER_RUNNING=$( mount | grep '/ type' | egrep '(overlay|aufs)' ) | |||
| if [[ "$IN_DOCKER_RUNNING" == "" ]] ; then | |||
There was a problem hiding this comment.
settings related to deployment mode should be judged in the outer layer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
8u332-jre-slim 支持arm64与amd64
兼容脚本，docker必须在前台运行否者会宕掉，loader.path docker 启动位置不同需要改为绝对路径
Ⅱ. Does this pull request fix one issue?
fixes #4660
fixes #4732
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews