-
Notifications
You must be signed in to change notification settings - Fork 607
perf(docker): improve pd/store/server image build cache efficiency #3025
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
c6e75ca
4cc2e42
2ddb092
46d5773
0952764
2f879b5
484b981
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| # IMPORTANT: .dockerignore does NOT inherit .gitignore — patterns must be restated. | ||
|
|
||
| # Build output | ||
| **/target/ | ||
|
|
||
| # Pre-extracted release dirs / archives | ||
| apache-hugegraph-*/ | ||
| **/*.tar | ||
| **/*.tar.gz* | ||
| **/*.zip | ||
| **/*.war | ||
|
|
||
| # IDE / OS | ||
| .idea/ | ||
| .vscode/ | ||
| **/*.iml | ||
| **/*.iws | ||
| **/.DS_Store | ||
|
|
||
| # Build / runtime artifacts | ||
| **/logs/ | ||
| **/*.log | ||
| **/*.class | ||
| **/gen-java/ | ||
| **/upload-files/ | ||
| **/target/dist/ | ||
| **/build/ | ||
| **/node_modules/ | ||
|
|
||
| # Env files | ||
| .env.local | ||
| .env.*.local | ||
|
|
||
| # Git internals | ||
| .git | ||
| .gitignore | ||
| .gitattribut | ||
| .github | ||
|
|
||
| # Compose / docs not needed in build context | ||
| **/docker-compose*.yml | ||
| **/docker-compose*.yaml | ||
| **/*.md | ||
| docs/ |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| name: "Docker Build CI" | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - 'release-*' | ||
| pull_request: | ||
| paths: | ||
| - '**/Dockerfile*' | ||
| - '.dockerignore' | ||
|
|
||
| jobs: | ||
| docker-build: | ||
| runs-on: ubuntu-24.04 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| dockerfile: | ||
| - hugegraph-pd/Dockerfile | ||
| - hugegraph-store/Dockerfile | ||
| - hugegraph-server/Dockerfile | ||
| - hugegraph-server/Dockerfile-hstore | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Build ${{ matrix.dockerfile }} | ||
| run: | | ||
| docker build -f ${{ matrix.dockerfile }} . |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| # syntax=docker/dockerfile:1 | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
|
|
@@ -19,15 +20,18 @@ | |
| # 1st stage: build source code | ||
| FROM maven:3.9.0-eclipse-temurin-11 AS build | ||
|
|
||
| COPY . /pkg | ||
| WORKDIR /pkg | ||
|
|
||
| COPY . . | ||
|
|
||
| ARG MAVEN_ARGS | ||
|
|
||
| RUN mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.skip=true && pwd && ls -l && rm \ | ||
| ./hugegraph-server/*.tar.gz && rm ./hugegraph-pd/*.tar.gz && rm ./hugegraph-store/*.tar.gz | ||
| RUN --mount=type=cache,target=/root/.m2 \ | ||
| mvn package $MAVEN_ARGS -e -B -ntp -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \ | ||
| && rm ./hugegraph-server/*.tar.gz ./hugegraph-pd/*.tar.gz ./hugegraph-store/*.tar.gz | ||
|
|
||
| # 2nd stage: runtime env | ||
| # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 | ||
| # Note: ZGC (The Z Garbage Collector) is only supported on ARM-Mac with java > 13 | ||
| FROM eclipse-temurin:11-jre-jammy | ||
|
|
||
| COPY --from=build /pkg/hugegraph-server/apache-hugegraph-server-*/ /hugegraph-server/ | ||
|
|
@@ -39,25 +43,18 @@ ENV JAVA_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport -XX:Max | |
| HUGEGRAPH_HOME="hugegraph-server" \ | ||
| STDOUT_MODE="true" | ||
|
|
||
| #COPY . /hugegraph/hugegraph-server | ||
| WORKDIR /hugegraph-server/ | ||
|
|
||
| # 1. Install environment and init HugeGraph Sever | ||
| RUN set -x \ | ||
| && rm /var/lib/dpkg/info/libc-bin.* \ | ||
| && apt-get -q clean \ | ||
| && apt-get -q update \ | ||
| # 1. Install runtime dependencies and configure server | ||
| RUN apt-get -q update \ | ||
| && apt-get -q install -y --no-install-recommends --no-install-suggests \ | ||
| dumb-init \ | ||
| procps \ | ||
| curl \ | ||
| lsof \ | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧹 Pre-existing issue (not a regression from this PR, but worth fixing while in the area): the
Same applies to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. removed cron from the runtime images for now since properly enabling it would expand the scope of this PR. happy to work on enabling this feature later in a follow up pr if u want |
||
| vim \ | ||
| cron \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| && service cron start \ | ||
| && pwd && cd /hugegraph-server/ \ | ||
| && sed -i "s/^restserver.url.*$/restserver.url=http:\/\/0.0.0.0:8080/g" ./conf/rest-server.properties | ||
|
|
||
| # 2. Init docker script | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.