From 3766aa346661e71eaaabbee7bfa64a2850dab5bf Mon Sep 17 00:00:00 2001 From: Jon Perry Date: Thu, 24 Aug 2023 15:08:12 +0000 Subject: [PATCH 1/2] update dockerfiles to be buildable on version 20.10.25 - Update chainguard image to use latest (other tags are no longer supported) - Updated base image to ensure the /home/$USER/app directory was created and chown'd correctly so future images would have permissions in the app/ directory --- Dockerfile | 2 +- leapfrogai/Dockerfile | 2 +- models/llms/mpt-7b-chat/Dockerfile | 2 +- models/llms/stablelm/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index aa1202cb7..c923f8129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM cgr.dev/chainguard/go:1.20 as build +FROM cgr.dev/chainguard/go:latest as build WORKDIR /work diff --git a/leapfrogai/Dockerfile b/leapfrogai/Dockerfile index c5df86631..9d4641ab4 100644 --- a/leapfrogai/Dockerfile +++ b/leapfrogai/Dockerfile @@ -9,7 +9,7 @@ ENV USER='user' RUN groupadd -r user && useradd -r -g $USER $USER -RUN mkdir -p /home/$USER +RUN mkdir -p /home/$USER/app RUN chown -R $USER /home/$USER RUN chmod a+rwx -R /home/$USER diff --git a/models/llms/mpt-7b-chat/Dockerfile b/models/llms/mpt-7b-chat/Dockerfile index 9358716f4..4e4aed70d 100644 --- a/models/llms/mpt-7b-chat/Dockerfile +++ b/models/llms/mpt-7b-chat/Dockerfile @@ -11,7 +11,7 @@ COPY get_model.py get_model.py RUN python3 get_model.py # Move the rest of the python files (most likely place layer cache will be invalidated) -COPY --chown=user:user *.py . +COPY --chown=user:user *.py ./ # Publish port EXPOSE 50051:50051 diff --git a/models/llms/stablelm/Dockerfile b/models/llms/stablelm/Dockerfile index ac16a8080..f457d00f3 100644 --- a/models/llms/stablelm/Dockerfile +++ b/models/llms/stablelm/Dockerfile @@ -9,7 +9,7 @@ COPY get_models.py get_models.py # # Get model weights and tokenizer RUN python3 get_models.py -COPY *.py . +COPY *.py ./ # Publish port EXPOSE 50051:50051 From 774a6570b8034b652ef67b236f500f9afbdd0535 Mon Sep 17 00:00:00 2001 From: Jon Perry Date: Fri, 25 Aug 2023 15:03:27 +0000 Subject: [PATCH 2/2] increment image tag in values file to 0.3.2w --- leapfrog-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leapfrog-values.yaml b/leapfrog-values.yaml index f67d62eb8..2f413fcf9 100644 --- a/leapfrog-values.yaml +++ b/leapfrog-values.yaml @@ -10,7 +10,7 @@ image: # down and only change it if you explicitly want to upgrade the Weaviate # version. - tag: 0.2.1 + tag: 0.3.2 domain: "###ZARF_VAR_DOMAIN###"