Commit 0ec7e72b authored by Elian Kraja's avatar Elian Kraja
Browse files

Merge branch '2.7.1-align-fixes' into '2.7.1-dev'

2.7.1 align fixes

See merge request !140
parents fc8ea911 26dbefb4
Loading
Loading
Loading
Loading
+125 −125

File changed.

Preview size limit exceeded, changes collapsed.

+110 −110

File changed.

Preview size limit exceeded, changes collapsed.

+2 −3
Original line number Diff line number Diff line
###### List of required python libraries ######
## To install the libraries, use:
# pip -r requirements.txt


robotframework==3.2.2
robotframework==3.1
RESTinstance==1.0.0rc4
robotframework-dependencylibrary==1.0.0.post1
robotframework-jsonlibrary==0.3
robotframework-jsonschemalibrary==1.0
robotframework-mockserver==0.0.4
robotframework-mockserver==0.0.7
robotframework-requests==0.7.1
+6 −9
Original line number Diff line number Diff line
@@ -28,21 +28,13 @@ RUN DEBIAN_FRONTEND=noninteractive \
        && mkdir -p /home/etsi/dev/robot \
        && cd /home/etsi/dev/robot 

RUN DEBIAN_FRONTEND=noninteractive \
        && cd /home/etsi/dev/robot \
	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
#RUN pip3 install robotframework

ADD requirements.txt /home/etsi/dev/robot/
ADD extensions /home/etsi/dev/robot/extensions

RUN ls /home/etsi/dev/robot

RUN DEBIAN_FRONTEND=noninteractive \
	&& cd /home/etsi/dev/robot \
	&& pip3 install -r requirements.txt \
	&& cd  robotframework-mockserver \
	&& patch -p1 < ../extensions/mockserverlibrary.patch \
	&& python3 -m pip install -e .

RUN DEBIAN_FRONTED=noninteractive \
	cd /home/etsi/dev/ \
@@ -52,6 +44,11 @@ RUN DEBIAN_FRONTED=noninteractive \
	&& pip3 install -r requirements.txt \
	&& python3 -m pip install -e .

RUN DEBIAN_FRONTEND=noninteractive \
	&& cd /home/etsi/dev/robot \
	&& pip3 install -r requirements.txt


ADD . /home/etsi/dev/robot

RUN	chmod +x /home/etsi/dev/robot/scripts/*