Merge pull request #8301 from kiendang/helm-cleanup-docker

Clean up HELM docker
OpenMined · Dec 5, 2023 · faa18bd · faa18bd
2 parents d307f68 + dfa0ea8
commit faa18bd
Show file tree

Hide file tree

Showing 15 changed files with 1,970 additions and 408 deletions.
diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
@@ -173,7 +173,24 @@ jobs:
           digest="${{ steps.grid-frontend-build.outputs.digest }}"
           touch "/tmp/digests/grid-frontend/${digest#sha256:}"
 
-      - name: Upload digest for grid-backend and grid-frontend
+      - name: Build and push `grid-seaweedfs` image to DockerHub
+        id: grid-seaweedfs-build
+        uses: docker/build-push-action@v5
+        with:
+          context: ./packages/grid/seaweedfs
+          file: ./packages/grid/seaweedfs/seaweedfs.dockerfile
+          platforms: ${{ steps.release_metadata.outputs.release_platform }}
+          outputs: type=image,name=openmined/grid-seaweedfs,push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=registry,ref=openmined/grid-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform }}
+          cache-to: type=registry,ref=openmined/grid-seaweedfs:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max
+
+      - name: Export digest for grid-seaweedfs
+        run: |
+          mkdir -p /tmp/digests/grid-seaweedfs
+          digest="${{ steps.grid-seaweedfs-build.outputs.digest }}"
+          touch "/tmp/digests/grid-seaweedfs/${digest#sha256:}"
+
+      - name: Upload digest for grid-backend, grid-frontend and grid-seaweedfs
         uses: actions/upload-artifact@v3
         with:
           name: digests-${{ steps.release_metadata.outputs.grid_version }}
@@ -221,6 +238,14 @@ jobs:
             -t openmined/grid-frontend:${{ needs.build-and-push-docker-images.outputs.release_tag }} \
             $(printf 'openmined/grid-frontend@sha256:%s ' *)
 
+      - name: Create manifest list and push for grid-seaweedfs
+        working-directory: /tmp/digests/grid-seaweedfs
+        run: |
+          docker buildx imagetools create  \
+            -t openmined/grid-seaweedfs:${{ needs.build-and-push-docker-images.outputs.grid_version }} \
+            -t openmined/grid-seaweedfs:${{ needs.build-and-push-docker-images.outputs.release_tag }} \
+            $(printf 'openmined/grid-seaweedfs@sha256:%s ' *)
+
   deploy-syft:
     needs: [merge-docker-images]
     if: always() &&  needs.merge-docker-images.result == 'success'

diff --git a/notebooks/helm/docker-helm-syft.ipynb b/notebooks/helm/docker-helm-syft.ipynb
diff --git a/packages/grid/default.env b/packages/grid/default.env
@@ -27,7 +27,7 @@ TRAEFIK_VERSION=v2.10
 REDIS_VERSION=6.2
 RABBITMQ_VERSION=3
 SEAWEEDFS_VERSION="3.59"
-DOCKER_IMAGE_SEAWEEDFS=chrislusf/seaweedfs
+DOCKER_IMAGE_SEAWEEDFS=openmined/grid-seaweedfs
 VERSION=latest
 VERSION_HASH=unknown
 STACK_API_KEY=""

diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
@@ -44,6 +44,16 @@ images:
     tags:
       - dev-latest
       - "${VERSION}"
+  seaweedfs:
+    image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_SEAWEEDFS}"
+    buildKit: {}
+    buildArgs:
+      SEAWEEDFS_VERSION: ${SEAWEEDFS_VERSION}
+    dockerfile: ./seaweedfs/seaweedfs.dockerfile
+    context: ./seaweedfs
+    tags:
+      - dev-latest
+      - "${VERSION}"
 
 # This is a list of `deployments` that DevSpace can create for this project
 deployments:
@@ -211,10 +221,7 @@ deployments:
         repo: https://charts.devspace.sh
       values:
         containers:
-          - image: "${DOCKER_IMAGE_SEAWEEDFS}:${SEAWEEDFS_VERSION}"
-            command:
-              - sh
-              - /etc/seaweedfs/start.sh
+          - image: "${CONTAINER_REGISTRY}/${DOCKER_IMAGE_SEAWEEDFS}:${VERSION}"
             env:
               - name: S3_VOLUME_SIZE_MB
                 value: "${S3_VOLUME_SIZE_MB}"
@@ -224,6 +231,8 @@ deployments:
                 value: "${S3_ROOT_PWD}"
               - name: S3_PORT
                 value: "${S3_PORT}"
+              - name: SEAWEED_MOUNT_PORT
+                value: "${SEAWEED_MOUNT_PORT}"
             volumeMounts:
               - containerPath: /etc/seaweedfs/filer.toml
                 volume:
@@ -251,6 +260,7 @@ deployments:
           ports:
             - port: "8888" # filer
             - port: "8333" # S3
+            - port: "4001" # mount azure
 
   frontend:
     helm:

diff --git a/packages/grid/docker-compose.build.yml b/packages/grid/docker-compose.build.yml
@@ -15,10 +15,16 @@ services:
       target: "backend"
     profiles:
       - backend
+
   seaweedfs:
     build:
       context: ${RELATIVE_PATH}./seaweedfs
       dockerfile: seaweedfs.dockerfile
+      args:
+        - SEAWEEDFS_VERSION=${SEAWEEDFS_VERSION}
+    profiles:
+      - blob-storage
+
   worker:
     build:
       context: ${RELATIVE_PATH}../

diff --git a/packages/grid/docker-compose.pull.yml b/packages/grid/docker-compose.pull.yml
@@ -7,7 +7,7 @@ services:
   #   image: rabbitmq:${RABBITMQ_VERSION?Variable not Set}${RABBITMQ_MANAGEMENT:-}
 
   seaweedfs:
-    image: "${DOCKER_IMAGE_SEAWEEDFS?Variable not set}:${SEAWEEDFS_VERSION}"
+    image: "${DOCKER_IMAGE_SEAWEEDFS?Variable not set}:${VERSION-latest}"
     profiles:
       - blob-storage
 

diff --git a/packages/grid/docker-compose.yml b/packages/grid/docker-compose.yml
@@ -236,17 +236,15 @@ services:
       - blob-storage
     depends_on:
       - proxy
+    env_file:
+      - .env
     image: "${DOCKER_IMAGE_SEAWEEDFS?Variable not set}:${VERSION-latest}"
     environment:
       - S3_VOLUME_SIZE_MB=${S3_VOLUME_SIZE_MB:-1024}
       - S3_ROOT_USER=${S3_ROOT_USER:-admin}
       - S3_ROOT_PWD=${S3_ROOT_PWD:-admin}
       - S3_PORT=${S3_PORT:-8888}
       - SEAWEED_MOUNT_PORT=${SEAWEED_MOUNT_PORT:-4001}
-      - STACK_API_KEY=$STACK_API_KEY
-    entrypoint: ["/bin/sh"]
-    command:
-      - "/start.sh"
     volumes:
       - seaweedfs-data:/data
       - ./seaweedfs/filer.toml:/etc/seaweedfs/filer.toml

diff --git a/packages/grid/helm/manifests.yaml b/packages/grid/helm/manifests.yaml
@@ -73,7 +73,7 @@ spec:
         - name: NODE_NAME
           value: default_node_name
         - name: NODE_SIDE_TYPE
-          value: ${NODE_SIDE_TYPE}
+          value: high
         - name: STACK_API_KEY
           value: changeme
         - name: PORT
@@ -533,6 +533,10 @@ spec:
     port: 8333
     protocol: TCP
     targetPort: 8333
+  - name: port-2
+    port: 4001
+    protocol: TCP
+    targetPort: 4001
   selector:
     app.kubernetes.io/component: seaweedfs
     app.kubernetes.io/name: devspace-app
@@ -569,9 +573,7 @@ spec:
       affinity: null
       containers:
       - args: null
-        command:
-        - sh
-        - /etc/seaweedfs/start.sh
+        command: null
         env:
         - name: S3_VOLUME_SIZE_MB
           value: '1024'
@@ -581,8 +583,10 @@ spec:
           value: admin
         - name: S3_PORT
           value: '8333'
+        - name: SEAWEED_MOUNT_PORT
+          value: '4001'
         envFrom: null
-        image: chrislusf/seaweedfs:3.59
+        image: docker.io/openmined/grid-seaweedfs:0.8.3-beta.3
         lifecycle: null
         livenessProbe: null
         name: container-0