enhance docker build with cache (#4068)

vesoft-inc · Mar 23, 2022 · 46e1527 · 46e1527
1 parent bdc95fe
commit 46e1527
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 116 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -62,14 +62,6 @@ jobs:
   docker:
     name: build docker image
     runs-on: [self-hosted, nebula]
-    strategy:
-      fail-fast: false
-      matrix:
-        service:
-          - graphd
-          - metad
-          - storaged
-          - tools
     steps:
       - uses: webiny/[email protected]
         with:
@@ -84,10 +76,38 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./docker/Dockerfile.${{ matrix.service }}
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-graphd:nightly
+          target: graphd
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-storaged:nightly
+          target: storaged
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            vesoft/nebula-metad:nightly
+          target: metad
+          push: true
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: |
-            vesoft/nebula-${{ matrix.service }}:nightly
+            vesoft/nebula-tools:nightly
+          target: tools
           push: true
 
   coverage:

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -68,14 +68,6 @@ jobs:
   docker_build:
     name: docker-build
     runs-on: [self-hosted, nebula]
-    strategy:
-      fail-fast: false
-      matrix:
-        service:
-          - graphd
-          - metad
-          - storaged
-          - tools
     steps:
       - uses: webiny/[email protected]
         with:
@@ -101,15 +93,62 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./docker/Dockerfile.${{ matrix.service }}
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-graphd:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-graphd:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: graphd
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-storaged:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-storaged:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: storaged
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-metad:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-metad:${{ steps.tagname.outputs.majorver }}
+            ${{ steps.docker.outputs.tag }}
+          push: true
+          target: metad
+          build-args: |
+            BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
+      
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.majorver }}
             ${{ steps.docker.outputs.tag }}
           push: true
+          target: tools
           build-args: |
             BRANCH=${{ steps.tagname.outputs.tag }}
+            VERSION=${{ steps.tagname.outputs.tagnum }}
 
   test:
     name: test

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,11 +1,13 @@
 FROM vesoft/nebula-dev:centos7 as builder
 
 ARG BRANCH=master
-
+ARG VERSION=
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \
-  && ./package.sh -n OFF -b ${BRANCH} -c OFF
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF 
 
 FROM centos:7 as graphd
 

diff --git a/docker/Dockerfile.graphd b/docker/Dockerfile.graphd
diff --git a/docker/Dockerfile.metad b/docker/Dockerfile.metad
diff --git a/docker/Dockerfile.storaged b/docker/Dockerfile.storaged
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
diff --git a/docker/README.md b/docker/README.md
@@ -2,7 +2,7 @@
 
 Following docker images will be ready in production.
 
-- [vesoft/nebula-graphd](https://hub.docker.com/r/vesoft/nebula-graphd): nebula-graphd service built with `Dockerfile.graphd`
-- [vesoft/nebula-metad](https://hub.docker.com/r/vesoft/nebula-metad): nebula-metad service built with `Dockerfile.metad`
-- [vesoft/nebula-storaged](https://hub.docker.com/r/vesoft/nebula-storaged): nebula-storaged service built with `Dockerfile.storaged`
-- [vesoft/nebula-tools](https://hub.docker.com/r/vesoft/nebula-tools): nebula tools built with `Dockerfile.tools`, including db_dump, meta_dump and db_upgrader
+- [vesoft/nebula-graphd](https://hub.docker.com/r/vesoft/nebula-graphd): nebula-graphd service built with `Dockerfile` and target `graphd`
+- [vesoft/nebula-metad](https://hub.docker.com/r/vesoft/nebula-metad): nebula-metad service built with `Dockerfile` and target `metad`
+- [vesoft/nebula-storaged](https://hub.docker.com/r/vesoft/nebula-storaged): nebula-storaged service built with `Dockerfile` and target `storaged`
+- [vesoft/nebula-tools](https://hub.docker.com/r/vesoft/nebula-tools): nebula tools built with `Dockerfile` and target `tools`, including db_dump, meta_dump and db_upgrader