From 08f4e23435bb91ffb7fe9569d4e9940b0e736582 Mon Sep 17 00:00:00 2001 From: Luke Lalor Date: Wed, 28 Aug 2024 23:31:29 -0700 Subject: [PATCH] attempt to fix docker image --- Dockerfile | 1 + sdk/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d158b8197..8a8295e6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN poetry build RUN poetry export --without dev --without-hashes --format=requirements.txt | grep -v "eidolon-ai-client" | grep -v "eidolon-ai-usage-client" | grep -v "-e file:///" > dist/requirements.txt FROM ${BASE_IMAGE} AS sdk_base +RUN apt-get update && apt-get install -y gcc COPY --from=builder dist/requirements.txt /tmp/eidolon_ai_sdk/requirements.txt RUN pip install -r /tmp/eidolon_ai_sdk/requirements.txt RUN playwright install diff --git a/sdk/Makefile b/sdk/Makefile index f0331bc6c..74c5ae4ce 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -13,11 +13,11 @@ CONTAINER_TOOL ?= docker dockerx: # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' ../Dockerfile > ../Dockerfile.cross - - $(CONTAINER_TOOL) buildx create --name project-v3-builder + $(CONTAINER_TOOL) buildx create --name project-v3-builder $(CONTAINER_TOOL) buildx use project-v3-builder - - $(CONTAINER_TOOL) buildx build --platform=$(PLATFORMS) --push -f ../Dockerfile.cross --target sdk_base -t ${PROJECT}/sdk_base -t ${PROJECT}/sdk_base:${VERSION} .. - - $(CONTAINER_TOOL) buildx build --platform=$(PLATFORMS) --push -f ../Dockerfile.cross -t ${PROJECT}/sdk -t ${PROJECT}/sdk:${VERSION} .. - - $(CONTAINER_TOOL) buildx rm project-v3-builder + $(CONTAINER_TOOL) buildx build --platform=$(PLATFORMS) --push -f ../Dockerfile.cross --target sdk_base -t ${PROJECT}/sdk_base -t ${PROJECT}/sdk_base:${VERSION} .. + $(CONTAINER_TOOL) buildx build --platform=$(PLATFORMS) --push -f ../Dockerfile.cross -t ${PROJECT}/sdk -t ${PROJECT}/sdk:${VERSION} .. + $(CONTAINER_TOOL) buildx rm project-v3-builder rm ../Dockerfile.cross maybe_docker_push: