From 44812a46e03f9d217fc214178bb0104e4ef69fe9 Mon Sep 17 00:00:00 2001 From: sallyom Date: Wed, 3 Apr 2024 18:16:53 -0400 Subject: [PATCH 1/3] update rag containerfile Signed-off-by: sallyom --- .../rag/builds/Containerfile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/recipes/natural_language_processing/rag/builds/Containerfile b/recipes/natural_language_processing/rag/builds/Containerfile index 564acb9d9..0a269b4ad 100644 --- a/recipes/natural_language_processing/rag/builds/Containerfile +++ b/recipes/natural_language_processing/rag/builds/Containerfile @@ -1,16 +1,4 @@ FROM registry.access.redhat.com/ubi9/python-311:1-52 -### Update sqlite for chroma -USER root -RUN dnf remove sqlite3 -y -RUN wget https://www.sqlite.org/2023/sqlite-autoconf-3410200.tar.gz -RUN tar -xvzf sqlite-autoconf-3410200.tar.gz -WORKDIR sqlite-autoconf-3410200 -RUN ./configure -RUN make -RUN make install -RUN mv /usr/local/bin/sqlite3 /usr/bin/sqlite3 -ENV LD_LIBRARY_PATH="/usr/local/lib" -#### WORKDIR /rag COPY builds/requirements.txt . RUN pip install --upgrade pip From 0f258b3f2fcb0874106b3ec26f810ccaef3172fe Mon Sep 17 00:00:00 2001 From: sallyom Date: Wed, 3 Apr 2024 18:42:06 -0400 Subject: [PATCH 2/3] add multiplatform rag image Signed-off-by: sallyom --- .github/workflows/build-images.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index 95e31306d..94223e63e 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -127,8 +127,7 @@ jobs: with: image: ${{ env.RAG_IMAGE }} tags: latest ${{ github.sha }} - # TODO: add amd64 - platforms: linux/arm64 + platforms: linux/arm64, linux/amd64 context: recipes/natural_language_processing/rag containerfiles: | ./recipes/natural_language_processing/rag/builds/Containerfile From 930a9e6d7088a7e880583c094e4821d0a119f091 Mon Sep 17 00:00:00 2001 From: sallyom Date: Wed, 3 Apr 2024 21:08:57 -0400 Subject: [PATCH 3/3] remove files to conserve disk space actions Signed-off-by: sallyom --- .github/workflows/ailab_image_build_push.yaml | 4 ++++ .github/workflows/build-images.yaml | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ailab_image_build_push.yaml b/.github/workflows/ailab_image_build_push.yaml index 5826ab219..895c79b9a 100644 --- a/.github/workflows/ailab_image_build_push.yaml +++ b/.github/workflows/ailab_image_build_push.yaml @@ -21,6 +21,10 @@ jobs: packages: write steps: + - name: Remove unnecessary files + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf "$AGENT_TOOLSDIRECTORY" - uses: actions/checkout@v4.1.1 # required for multi-arch builds - name: Install qemu dependency diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index 94223e63e..31500359b 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -9,8 +9,6 @@ on: workflow_dispatch: branches: [main] -permissions: write-all - jobs: build: runs-on: ubuntu-latest # windows-latest || macos-latest @@ -23,6 +21,11 @@ jobs: RAG_IMAGE: rag CHROMADB_IMAGE: chromadb steps: + - name: Remove unnecessary files + run: | + sudo rm -rf /usr/share/dotnet + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v4 with: fetch-depth: 0 # OR "2" -> To retrieve the preceding commit.