Skip to content
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

Clean up HELM docker #8301

Merged
merged 27 commits into from
Dec 5, 2023
Merged

Conversation

kiendang
Copy link
Contributor

@kiendang kiendang commented Dec 1, 2023

Description

Please include a summary of the change, the motivation, and any additional context that will help others understand your PR. If it closes one or more open issues, please tag them as described here.

Affected Dependencies

List any dependencies that are required for this change.

How has this been tested?

  • Describe the tests that you ran to verify your changes.
  • Provide instructions so we can reproduce.
  • List any relevant details for your test configuration.

Checklist

@kiendang kiendang requested a review from shubham3121 December 1, 2023 07:07
@kiendang kiendang marked this pull request as ready for review December 1, 2023 07:18
@koenvanderveen koenvanderveen deleted the branch OpenMined:dev December 2, 2023 01:00
@kiendang kiendang reopened this Dec 2, 2023
@kiendang kiendang changed the base branch from helm to dev December 2, 2023 16:05
@@ -27,7 +27,8 @@ 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
DOCKER_IMAGE_SEAWEEDFS_ORIGINAL=chrislusf/seaweedfs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is always the same I suppose? If thats true, why do we have a variable for it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We build our own image for seaweed based on the chrislusf/seaweedfs image (see seaweed.dockerfile) and push it to the registry as openmined/grid-seaweedfs.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I understand that, but why is it a variable, instead of hardcoded

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ya good point. not very useful here.

Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@@ -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}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MAYBE: Since the seaweedfs dockerfile take the version as an argument,

ARG SEAWEEDFS_VERSION

FROM chrislusf/seaweedfs:${SEAWEEDFS_VERSION}

do we need to add it also the docker compose
environment variables including SEAWEEDFS_VERSION

Copy link
Collaborator

@rasswanth-s rasswanth-s Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might also need to add it also to devspace.yaml, for
seaweedfs deployment

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we will have to update that as well.

Copy link
Member

@shubham3121 shubham3121 Dec 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we pass the SEAWEEDFS_VERSION as an arg to docker compose build
Screenshot from 2023-12-05 16-23-17

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we might to take care of devspace, that's true,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added to devspace

@koenvanderveen koenvanderveen self-assigned this Dec 5, 2023
@koenvanderveen koenvanderveen merged commit faa18bd into OpenMined:dev Dec 5, 2023
27 checks passed
@kiendang kiendang deleted the helm-cleanup-docker branch December 5, 2023 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants