X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=docker%2Fhardware%2FDockerfile;fp=docker%2Fhardware%2FDockerfile;h=19836f0bc133c7338d15fb668c92260430260aa7;hp=a21cb64c42ed435efb4563d6f56334f6964b2cc8;hb=17bfb0b141931c48ab07dd1303216624bc053aed;hpb=82be52a9082be8cde1170e69d0f7f27e1225a208 diff --git a/docker/hardware/Dockerfile b/docker/hardware/Dockerfile index a21cb64..19836f0 100644 --- a/docker/hardware/Dockerfile +++ b/docker/hardware/Dockerfile @@ -15,20 +15,38 @@ ############################################################################## # 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 \ + musl-dev \ + openjpeg-dev \ openssl-dev \ - wget + 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 @@ -42,12 +60,41 @@ RUN wget -qO- https://github.com/DMTF/Redfish-Usecase-Checkers/archive/master.zi unzip -qd /opt/akraino - # Copy binaries in the final contaier and install robot framework -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/Redfish-Test-Framework-master /opt/akraino/Redfish-Test-Framework COPY --from=build /opt/akraino/Redfish-Usecase-Checkers-master /opt/akraino/Redfish-Usecase-Checkers +RUN apk --no-cache add --update \ + build-base \ + cairo \ + cairo-dev \ + cargo \ + curl \ + 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 && \ @@ -60,6 +107,3 @@ RUN pip install -r /opt/akraino/validation/bluval/requirements.txt RUN pip install html-testRunner \ -r /opt/akraino/Redfish-Usecase-Checkers/requirements.txt -# Install curl -RUN apk --no-cache add --update \ - curl