X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fdocker%2FDockerfile;h=cdf8f2f79ac273fd5834a14f8e591c5453297f03;hp=82c70403be29ef2f249643014c55ebeb92c3ccd7;hb=17bfb0b141931c48ab07dd1303216624bc053aed;hpb=82be52a9082be8cde1170e69d0f7f27e1225a208 diff --git a/docker/docker/Dockerfile b/docker/docker/Dockerfile index 82c7040..cdf8f2f 100644 --- a/docker/docker/Dockerfile +++ b/docker/docker/Dockerfile @@ -15,18 +15,37 @@ ############################################################################## # ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds -FROM python:3.6-alpine3.9 as build +FROM python:3.10.0b1-alpine3.13 as build # Install dependencies COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt RUN apk --no-cache add --update \ + build-base \ + cairo \ + cairo-dev \ + cargo \ + freetype-dev \ gcc \ + gdk-pixbuf-dev \ + gettext \ git \ - libc-dev \ - libffi \ + jpeg-dev \ + lcms2-dev \ libffi-dev \ - make \ - openssl-dev + musl-dev \ + openjpeg-dev \ + openssl-dev \ + pango-dev \ + poppler-utils \ + postgresql-client \ + postgresql-dev \ + py-cffi \ + python3-dev \ + rust \ + tcl-dev \ + tiff-dev \ + tk-dev \ + zlib-dev # Build binaries WORKDIR /wheels @@ -36,11 +55,39 @@ RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation RUN git clone https://github.com/docker/docker-bench-security.git /opt/akraino/docker-bench-security # Copy binaries in the final container and install requirements -FROM python:3.6-alpine3.9 +FROM python:3.10.0b1-alpine3.13 COPY --from=build /wheels /wheels COPY --from=build /opt/akraino/validation /opt/akraino/validation COPY --from=build /opt/akraino/docker-bench-security /opt/akraino/docker-bench-security +RUN apk --no-cache add --update \ + build-base \ + cairo \ + cairo-dev \ + cargo \ + freetype-dev \ + gcc \ + gdk-pixbuf-dev \ + gettext \ + git \ + jpeg-dev \ + lcms2-dev \ + libffi-dev \ + musl-dev \ + openjpeg-dev \ + openssl-dev \ + pango-dev \ + poppler-utils \ + postgresql-client \ + postgresql-dev \ + py-cffi \ + python3-dev \ + rust \ + tcl-dev \ + tiff-dev \ + tk-dev \ + zlib-dev + RUN pip3 install -r /wheels/requirements/pip-requirements.txt \ -f /wheels && \ rm -rf /wheels && \