diff --git a/Dockerfile b/Dockerfile index 83006b5f48..f5fb2e6610 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,43 +2,9 @@ # See LICENSE in the project root for license information. #--------------------------------------------------------------------------------------------- -ARG PYTHON_VERSION="3.11" -ARG PLUGINS_FILE="./recommended-plugins.txt" +FROM ape:latest-slim -FROM python:${PYTHON_VERSION} as builder +RUN pip install --upgrade pip +RUN pip install /wheels/*.whl -WORKDIR /wheels - -COPY ./recommended-plugins.txt ./recommended-plugins.txt -COPY . . - -RUN pip install --upgrade pip \ - && pip install wheel \ - && pip wheel .[recommended-plugins] --wheel-dir=/wheels - -FROM python:${PYTHON_VERSION}-slim - -# See http://label-schema.org for metadata schema -# TODO: Add `build-date` and `version` -LABEL maintainer="ApeWorX" \ - org.label-schema.schema-version="2.0" \ - org.label-schema.name="ape" \ - org.label-schema.description="Ape Ethereum Framework." \ - org.label-schema.url="https://docs.apeworx.io/ape/stable/" \ - org.label-schema.usage="https://docs.apeworx.io/ape/stable/userguides/quickstart.html#via-docker" \ - org.label-schema.vcs-url="https://github.com/ApeWorX/ape" \ - org.label-schema.docker.cmd="docker run --volume $HOME/.ape:/home/harambe/.ape --volume $HOME/.vvm:/home/harambe/.vvm --volume $HOME/.solcx:/home/harambe/.solcx --volume $PWD:/home/harambe/project --workdir /home/harambe/project apeworx/ape compile" - -RUN useradd --create-home --shell /bin/bash harambe - -COPY --from=builder /wheels /wheels -COPY ./recommended-plugins.txt ./recommended-plugins.txt - -RUN pip install --upgrade pip \ - pip install --no-cache-dir --find-links=/wheels -r ./recommended-plugins.txt \ - && ape --version - -WORKDIR /home/harambe/project -RUN chown --recursive harambe:harambe /home/harambe -USER harambe -ENTRYPOINT ["ape"] +RUN ape --version diff --git a/Dockerfile.slim b/Dockerfile.slim index b5f37e819f..105b0fa302 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -15,6 +15,12 @@ COPY . . RUN pip wheel . +RUN mkdir /wheels/recommended_plugins + +COPY ./recommended-plugins.txt ./recommended-plugins.txt + +RUN pip wheel .[recommended-plugins] --wheel-dir=/wheels/recommended_plugins + FROM python:${PYTHON_VERSION}-slim # See http://label-schema.org for metadata schema @@ -34,6 +40,7 @@ COPY --from=builder /wheels/*.whl /wheels/ RUN pip install --upgrade pip RUN pip install /wheels/*.whl +COPY --from=builder /wheels/recommended_plugins/*.whl /wheels/ RUN ape --version WORKDIR /home/harambe/project