fix version in docker image and Revert 4068 (#4080)

* Revert "enhance docker build, using cache" This reverts commit 9e2bec3. * fix docker version Co-authored-by: Sophie <[email protected]>
vesoft-inc · Mar 25, 2022 · 5d96c60 · 5d96c60
1 parent 60cf573
commit 5d96c60
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 84 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -62,6 +62,14 @@ 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:
@@ -76,38 +84,10 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          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
+          file: ./docker/Dockerfile.${{ matrix.service }}
           platforms: linux/amd64,linux/arm64
           tags: |
-            vesoft/nebula-tools:nightly
-          target: tools
+            vesoft/nebula-${{ matrix.service }}:nightly
           push: true
 
   coverage:

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -68,6 +68,14 @@ 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:
@@ -93,62 +101,16 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          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
+          file: ./docker/Dockerfile.${{ matrix.service }}
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.tag }}
-            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-tools:${{ steps.tagname.outputs.majorver }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.tag }}
+            ${{ secrets.HARBOR_REGISTRY }}/vesoft/nebula-${{ matrix.service }}:${{ steps.tagname.outputs.majorver }}
             ${{ steps.docker.outputs.tag }}
           push: true
-          target: tools
           build-args: |
             BRANCH=${{ steps.tagname.outputs.tag }}
-            VERSION=${{ steps.tagname.outputs.tagnum }}
+            VERSON=${{ steps.tagname.outputs.tagnum }}
 
   test:
     name: test

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,6 +2,7 @@ FROM vesoft/nebula-dev:centos7 as builder
 
 ARG BRANCH=master
 ARG VERSION=
+
 COPY . /home/nebula/BUILD
 
 RUN cd /home/nebula/BUILD/package \

diff --git a/docker/Dockerfile.graphd b/docker/Dockerfile.graphd
@@ -0,0 +1,26 @@
+FROM vesoft/nebula-dev:centos7 as builder
+
+ARG BRANCH=master
+ARG VERSION=
+
+COPY . /home/nebula/BUILD
+
+RUN cd /home/nebula/BUILD/package \
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+
+FROM centos:7
+
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-common.rpm /usr/local/nebula/nebula-common.rpm
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-graph.rpm /usr/local/nebula/nebula-graphd.rpm
+
+WORKDIR /usr/local/nebula
+
+RUN rpm -ivh *.rpm \
+  && mkdir -p ./{logs,data,pids} \
+  && rm -rf *.rpm
+
+EXPOSE 9669 19669 19670
+
+ENTRYPOINT ["/usr/local/nebula/bin/nebula-graphd", "--flagfile=/usr/local/nebula/etc/nebula-graphd.conf", "--daemonize=false", "--containerized=true"]
diff --git a/docker/Dockerfile.metad b/docker/Dockerfile.metad
@@ -0,0 +1,26 @@
+FROM vesoft/nebula-dev:centos7 as builder
+
+ARG BRANCH=master
+ARG VERSION=
+
+COPY . /home/nebula/BUILD
+
+RUN cd /home/nebula/BUILD/package \
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+
+FROM centos:7
+
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-common.rpm /usr/local/nebula/nebula-common.rpm
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-meta.rpm /usr/local/nebula/nebula-metad.rpm
+
+WORKDIR /usr/local/nebula
+
+RUN rpm -ivh *.rpm \
+  && mkdir -p ./{logs,data,pids} \
+  && rm -rf *.rpm
+
+EXPOSE 9559 9560 19559 19560
+
+ENTRYPOINT ["/usr/local/nebula/bin/nebula-metad", "--flagfile=/usr/local/nebula/etc/nebula-metad.conf", "--daemonize=false", "--containerized=true"]
diff --git a/docker/Dockerfile.storaged b/docker/Dockerfile.storaged
@@ -0,0 +1,26 @@
+FROM vesoft/nebula-dev:centos7 as builder
+
+ARG BRANCH=master
+ARG VERSION=
+
+COPY . /home/nebula/BUILD
+
+RUN cd /home/nebula/BUILD/package \
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+
+FROM centos:7
+
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-common.rpm /usr/local/nebula/nebula-common.rpm
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-storage.rpm /usr/local/nebula/nebula-storaged.rpm
+
+WORKDIR /usr/local/nebula
+
+RUN rpm -ivh *.rpm \
+  && mkdir -p ./{logs,data,pids} \
+  && rm -rf *.rpm
+
+EXPOSE 9777 9778 9779 9780 19779 19780
+
+ENTRYPOINT ["/usr/local/nebula/bin/nebula-storaged", "--flagfile=/usr/local/nebula/etc/nebula-storaged.conf", "--daemonize=false", "--containerized=true"]
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
@@ -0,0 +1,23 @@
+FROM vesoft/nebula-dev:centos7 as builder
+
+ARG BRANCH=master
+ARG VERSION=
+
+COPY . /home/nebula/BUILD
+
+RUN cd /home/nebula/BUILD/package \
+  && [[ -z "${VERSION}" ]] \
+  && ./package.sh -n OFF -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON \
+  || ./package.sh -n OFF -v ${VERSION} -b ${BRANCH} -t RelWithDebInfo -s TRUE -c OFF -k ON 
+
+FROM centos:7
+
+COPY --from=builder /home/nebula/BUILD/pkg-build/cpack_output/nebula-*-tool.rpm /usr/local/nebula/nebula-tool.rpm
+
+WORKDIR /usr/local/nebula
+
+RUN rpm -ivh *.rpm \
+  && rm -rf *.rpm
+
+# default entrypoint
+ENTRYPOINT ["/usr/local/nebula/bin/db_dump"]
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` 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
+- [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