-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Make Dockerfile-ollama-local detect arch #360
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
base: main
Are you sure you want to change the base?
Conversation
Summary of ChangesHello @grivanov, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request enhances the Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request correctly automates the architecture detection in Dockerfile-ollama-local
, removing the need for a manual build argument. This is a great improvement for usability. I've added one suggestion to refactor the shell script logic using a case
statement, which is more idiomatic and readable for this scenario.
RUN OLLAMA_ARCH=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ | ||
if [ "$OLLAMA_ARCH" = "arm64" ]; then \ | ||
echo "Building for ARM64 architecture."; \ | ||
elif [ "$OLLAMA_ARCH" = "amd64" ]; then \ | ||
echo "Building for AMD64 architecture."; \ | ||
else \ | ||
echo "Error: Unsupported architecture '$TARGETARCH'. Supported architectures are 'arm64' and 'amd64'." >&2 && \ | ||
echo "Error: Unsupported architecture '$OLLAMA_ARCH'. Supported architectures are 'arm64' and 'amd64'." >&2 && \ | ||
exit 1; \ | ||
fi && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While the if/elif/else
structure works, using a case
statement is more idiomatic and readable for shell scripts when checking a variable against multiple possible values. This also provides an opportunity to use the more portable uname -m
command instead of arch
, slightly optimize the sed
command by combining expressions, and remove unnecessary semicolons.
RUN OLLAMA_ARCH=$(uname -m | sed -e 's/aarch64/arm64/' -e 's/x86_64/amd64/') && \
case "$OLLAMA_ARCH" in \
arm64) \
echo "Building for ARM64 architecture." \
;; \
amd64) \
echo "Building for AMD64 architecture." \
;; \
*) \
echo "Error: Unsupported architecture '$OLLAMA_ARCH'. Supported architectures are 'arm64' and 'amd64'." >&2 && \
exit 1 \
;; \
esac && \
Currently there is an
ARG TARGETARCH
that defaults to 'arm64', so the build fails on 'amd64'.The documentation in Ollama-instruction.md doesn't mention this in Step 4.
It only provides this:
docker build -f Dockerfile-ollama-local -t deepwiki:ollama-local .
without mentioning the actually required--build-arg TARGETARCH=<arch>
:This PR aims to fix this and actually detect the build arch.