diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml index e9f2015343ec5e2c36238c345d1bb8c85825c96c..72e243f1af71385b120d3ca6f982db5ca6f30af5 100644 --- a/charts/ska-tango-umbrella/Chart.yaml +++ b/charts/ska-tango-umbrella/Chart.yaml @@ -6,10 +6,10 @@ version: 0.2.5 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png dependencies: - name: ska-tango-base - version: 0.3.15 + version: 0.3.16 repository: file://../ska-tango-base condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled - name: ska-tango-util - version: 0.3.15 + version: 0.3.16 repository: file://../ska-tango-util diff --git a/images/ska-tango-images-pytango-builder-alpine/Dockerfile b/images/ska-tango-images-pytango-builder-alpine/Dockerfile index 9443b001f6b06033bc806c3767722a36879019cc..3a2b38b4b2e968c47e2d2f12a8f67252077f98e7 100644 --- a/images/ska-tango-images-pytango-builder-alpine/Dockerfile +++ b/images/ska-tango-images-pytango-builder-alpine/Dockerfile @@ -3,12 +3,12 @@ ARG BASE_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-cpp-alpine:0.0.0 FROM $BASE_IMAGE LABEL \ - author="Piers Harding <Piers.Harding@skao.int>" \ - description="This image illustrates build dependencies" \ - license="Apache2.0" \ - int.skao.team="Systems Team" \ - int.skao.website="https://gitlab.com/ska-telescope/sdi/ska-ser-containerisation-and-orchestration" \ - int.skao.application="Tango Builder" + author="Piers Harding <Piers.Harding@skao.int>" \ + description="This image illustrates build dependencies" \ + license="Apache2.0" \ + int.skao.team="Systems Team" \ + int.skao.website="https://gitlab.com/ska-telescope/sdi/ska-ser-containerisation-and-orchestration" \ + int.skao.application="Tango Builder" USER root # pkgconfig needs to find these @@ -40,13 +40,17 @@ COPY pip.conf /etc/pip.conf WORKDIR /app COPY requirements.txt requirements.txt +# Install poetry +RUN curl -sSL https://install.python-poetry.org | python3 - +ENV PATH="/root/.local/bin:$PATH" + # Install numpy manually before PyTango and other requirements to ensure we # build PyTango with numpy support. RUN python3.9 -m pip install --prefix=/usr/local wheel numpy==1.21.0 \ -# now install build requirements + # now install build requirements && python3.9 -m pip install --prefix=/usr/local -r requirements.txt \ -# this should be commented if we wish for the builder -# to keep the python cache + # this should be commented if we wish for the builder + # to keep the python cache && python3.9 -m pip cache purge # do ldconfig stuff @@ -55,7 +59,7 @@ RUN mkdir -p /etc/ld.so.conf.d \ && echo "/usr/local/lib" > /etc/ld.so.conf.d/tango.conf \ && echo "/usr/local/lib64" > /etc/ld.so.conf.d/tango.conf \ && ldconfig /etc/ld.so.conf.d \ -# this was on the debian version + # this was on the debian version && mkdir /venv \ && ln -s /usr/* /venv/ \ && ln -s /usr/local/bin/itango3 /venv/bin/itango3 \ diff --git a/images/ska-tango-images-pytango-builder-alpine/requirements.txt b/images/ska-tango-images-pytango-builder-alpine/requirements.txt index ba99c5e5dc53ba0fbbbe931f09d0d33d11a5da5e..2e28627921559d2e09da369ee13082a32b906880 100644 --- a/images/ska-tango-images-pytango-builder-alpine/requirements.txt +++ b/images/ska-tango-images-pytango-builder-alpine/requirements.txt @@ -5,7 +5,6 @@ flake8 flake8_formatter_junit_xml isort black -poetry ipython==7.27.0 itango==0.1.8 coverage @@ -33,3 +32,4 @@ sphinxcontrib-websupport requests tox transitions +virtualenv==20.16.2