Skip to content

More generic image type for OCI-compliant container technologies#802

Merged
raghotham merged 3 commits intollamastack:mainfrom
terrytangyuan:container-img
Jan 18, 2025
Merged

More generic image type for OCI-compliant container technologies#802
raghotham merged 3 commits intollamastack:mainfrom
terrytangyuan:container-img

Conversation

@terrytangyuan
Copy link
Copy Markdown
Contributor

It's a more generic term and applicable to alternatives of Docker, such as Podman or other OCI-compliant technologies.

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Meta Open Source bot. label Jan 17, 2025
Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Copy link
Copy Markdown
Member

@raghotham raghotham left a comment

Choose a reason for hiding this comment

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

seems like corresponding changes to build_container.sh are missing

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
@terrytangyuan
Copy link
Copy Markdown
Contributor Author

@raghotham Thanks! Updated.

@raghotham raghotham merged commit 6da3053 into llamastack:main Jan 18, 2025
@yanxi0830
Copy link
Copy Markdown
Contributor

@terrytangyuan could you help verify that this workflow works under the change? https://github.com/meta-llama/llama-stack/actions/workflows/publish-to-docker.yml

@terrytangyuan terrytangyuan deleted the container-img branch January 18, 2025 00:38
@terrytangyuan
Copy link
Copy Markdown
Contributor Author

Yes, will test and let you know

@terrytangyuan
Copy link
Copy Markdown
Contributor Author

terrytangyuan commented Jan 18, 2025

@yanxi0830 That workflow is currently failing. Looks like the image names have additional "-distribution" that might be unexpected. I don't think it's related to this PR though.

Run docker images
REPOSITORY                                     TAG               IMAGE ID       CREATED          SIZE
distribution-distribution-meta-reference-gpu   test-0.1.0rc7     995b5f580159   17 seconds ago   6.46GB
distribution-distribution-tgi                  test-0.1.0rc7     d77a229facfc   2 minutes ago    1.87GB
distribution-distribution-together             test-0.1.0rc7     afdab49dc8b6   3 minutes ago    1.88GB
distribution-distribution-fireworks            test-0.1.0rc7     ce3e06f23141   5 minutes ago    1.88GB
distribution-distribution-remote-vllm          test-0.1.0rc7     b4c5558b6bd3   6 minutes ago    1.7GB
distribution-distribution-bedrock              test-0.1.0rc7     12a7ad8db1f8   8 minutes ago    1.89GB
distribution-distribution-ollama               test-0.1.0rc7     6850568e9ef7   9 minutes ago    1.87GB
moby/buildkit                                  buildx-stable-1   a72f628fa83e   4 weeks ago      206MB

@yanxi0830
Copy link
Copy Markdown
Contributor

@yanxi0830 That workflow is currently failing. Looks like the image names have additional "-distribution" that might be unexpected. Not sure if it's related to this PR though.


Run docker images

REPOSITORY                                     TAG               IMAGE ID       CREATED          SIZE

distribution-distribution-meta-reference-gpu   test-0.1.0rc7     995b5f580159   17 seconds ago   6.46GB

distribution-distribution-tgi                  test-0.1.0rc7     d77a229facfc   2 minutes ago    1.87GB

distribution-distribution-together             test-0.1.0rc7     afdab49dc8b6   3 minutes ago    1.88GB

distribution-distribution-fireworks            test-0.1.0rc7     ce3e06f23141   5 minutes ago    1.88GB

distribution-distribution-remote-vllm          test-0.1.0rc7     b4c5558b6bd3   6 minutes ago    1.7GB

distribution-distribution-bedrock              test-0.1.0rc7     12a7ad8db1f8   8 minutes ago    1.89GB

distribution-distribution-ollama               test-0.1.0rc7     6850568e9ef7   9 minutes ago    1.87GB

moby/buildkit                                  buildx-stable-1   a72f628fa83e   4 weeks ago      206MB

Thanks for flagging! Under my radar and will take a look.

@terrytangyuan
Copy link
Copy Markdown
Contributor Author

@yanxi0830 Small fix for a different issue #819

@terrytangyuan
Copy link
Copy Markdown
Contributor Author

terrytangyuan commented Jan 18, 2025

Can you merge #801 and #819 and see if the workflow succeeds?

yanxi0830 added a commit that referenced this pull request Jan 18, 2025
…#821)

# What does this PR do?

**Main Thing**
- Add a simple test step before publishing docker image in workflow

**Side Fix**
- Docker push action fails recently due to extra prefix introduced. E.g.
see:
#802 (comment)

cc @terrytangyuan 

## Test Plan

1. Release a TestPyPi version on this code: 0.0.63.dev51206766


https://github.com/meta-llama/llama-stack/actions/runs/12841805606/job/35812033317?pr=821

```
# 1. build docker image
TEST_PYPI_VERSION=0.0.63.dev51206766 llama stack build --template fireworks

# 2. test the docker image
cd distributions/fireworks && docker compose up
```

4. Test the full build + test docker flow using TestPyPi from (1):
https://github.com/meta-llama/llama-stack/actions/runs/12842184947

<img width="1049" alt="image"
src="https://github.com/user-attachments/assets/c025893d-5ce2-48ff-aa90-de00e105ee09"
/>


## Sources

Please link relevant resources if necessary.


## Before submitting

- [ ] This PR fixes a typo or improves the docs (you can dismiss the
other checks if that's the case).
- [ ] Ran pre-commit to handle lint / formatting issues.
- [ ] Read the [contributor
guideline](https://github.com/meta-llama/llama-stack/blob/main/CONTRIBUTING.md),
      Pull Request section?
- [ ] Updated relevant documentation.
- [ ] Wrote necessary unit or integration tests.
ashwinb pushed a commit that referenced this pull request Jan 29, 2025
ashwinb pushed a commit that referenced this pull request Jan 29, 2025
The current link doesn't work. Also changed docs to be consistent with
#802.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA Signed This label is managed by the Meta Open Source bot.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants