Commit e820d268 authored by Jean Meurice's avatar Jean Meurice
Browse files

Docker Scripts update

parent 7c406375
Pipeline #231329 passed with stage
in 7 minutes and 11 seconds
...@@ -2,10 +2,12 @@ FROM maven:3-jdk-8 AS montisim-server-builder ...@@ -2,10 +2,12 @@ FROM maven:3-jdk-8 AS montisim-server-builder
WORKDIR /app WORKDIR /app
COPY . .
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends metis && \ apt-get install -y --no-install-recommends libxext6 libxrender1 libxtst6 metis && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
mvn install -s settings.xml -DskipTests && \ echo "export LD_LIBRARY_PATH=/usr/local/openjdk-8/jre/lib/amd64" > ~/.bashrc
COPY . .
RUN mvn install -s settings.xml -DskipTests && \
mv rpc/target/rpc-jar-with-dependencies.jar rpc/target/rpc.jar mv rpc/target/rpc-jar-with-dependencies.jar rpc/target/rpc.jar
File mode changed from 100644 to 100755
...@@ -35,7 +35,7 @@ docker run \ ...@@ -35,7 +35,7 @@ docker run \
--rm --network="$NETWORK_NAME" \ --rm --network="$NETWORK_NAME" \
-e "ZOO_SERVERS=zookeeper" \ -e "ZOO_SERVERS=zookeeper" \
montisim-server-builder \ montisim-server-builder \
bash -c "pushd rpc && mvn test -s ../settings.xml && popd && cd restful && mvn test -Dtest=\!IntegrationTest* -s ../settings.xml" bash -c "source ~/.bashrc && pushd rpc && mvn test -s ../settings.xml && popd && cd restful && mvn test -Dtest=\!IntegrationTest* -s ../settings.xml"
code=$? code=$?
......
...@@ -16,12 +16,12 @@ docker run ^ ...@@ -16,12 +16,12 @@ docker run ^
-e "ZOO_MAX_CLIENT_CNXNS=1024" ^ -e "ZOO_MAX_CLIENT_CNXNS=1024" ^
zookeeper:latest zookeeper:latest
pushd %ROOT_DIR%\docker
docker run ^ docker run ^
--rm --network=%NETWORK_NAME% ^ --rm --network=%NETWORK_NAME% ^
-e "ZOO_SERVERS=zookeeper" ^ -e "ZOO_SERVERS=zookeeper" ^
montisim-server-builder sh -c "cd restful && mvn test -Dtest=\!IntegrationTest* -s ../settings.xml" montisim-server-builder ^
popd bash -c "source ~/.bashrc && pushd rpc && mvn test -s ../settings.xml && popd && cd restful && mvn test -Dtest=\!IntegrationTest* -s ../settings.xml"
set FAILURE=%errorlevel% set FAILURE=%errorlevel%
if %errorlevel% neq 0 ( if %errorlevel% neq 0 (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment