X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils%2Fdocker%2FDockerfile;h=7270ab5855d063181beb3eb574b6422b5a5c437f;hb=7408542a62711664395fcc15582d277d186daa86;hp=d71a53dea4df8e3a35472c88574761cd4ae4d0a9;hpb=a3a4c991299766f664273b68ab560d9acfcab003;p=osm%2Fvim-emu.git diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile index d71a53d..7270ab5 100644 --- a/utils/docker/Dockerfile +++ b/utils/docker/Dockerfile @@ -1,11 +1,7 @@ -FROM cgeoffroy/dockernet +FROM mpeuster/containernet +MAINTAINER manuel@peuster.de -# ensure that we have the latest dockernet code base! -WORKDIR / -RUN rm -rf dockernet -RUN git clone -b dockernet-sonata https://github.com/mpeuster/dockernet.git -WORKDIR /dockernet -RUN python setup.py develop +ENV SON_EMU_IN_DOCKER 1 WORKDIR /son-emu COPY . /son-emu/ @@ -13,6 +9,8 @@ COPY . /son-emu/ RUN cd /son-emu/ansible \ && ansible-playbook install.yml \ && cd /son-emu \ + # we need to reset the __pycache__ for correct test discovery + && rm -rf src/emuvim/test/__pycache__ \ && python setup.py install \ && echo 'Done'