Skip to content

Commit

Permalink
attempt to fix docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeLalor committed Aug 29, 2024
1 parent fff90fb commit 08f4e23
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions sdk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 08f4e23

Please sign in to comment.