From 872a3409eb427baff0c6ebfb2d3129e04a8f0bb1 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 12:39:49 +0200 Subject: [PATCH 01/11] Update dockerfiles --- .gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++---------------- docker/Dockerfile | 12 ++++++++---- docker/build.sh | 4 +--- 3 files changed, 41 insertions(+), 23 deletions(-) mode change 100644 => 100755 docker/build.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ba9bae..fd81e3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,23 +37,39 @@ masterJobWindows: tags: - Windows10 +# BranchJobLinux: +# stage: build +# image: maven:3-jdk-8 +# before_script: +# - apt update +# - apt --assume-yes install libxext6 +# - apt --assume-yes install libxrender1 +# - apt --assume-yes install libxtst6 +# #- apt --assume-yes install realpath +# script: +# - "JAWT_LIB=$(find / -name libjawt.so -print -quit)" +# - "echo JAWT_LIB: $JAWT_LIB" +# - "JAWT_FOLDER=$(dirname ${JAWT_LIB})" +# - "echo JAWT_FOLDER: $JAWT_FOLDER" +# - "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}" +# - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml +# except: +# - master +# tags: +# - se + BranchJobLinux: + image: docker:dind stage: build - image: maven:3-jdk-8 before_script: - - apt update - - apt --assume-yes install libxext6 - - apt --assume-yes install libxrender1 - - apt --assume-yes install libxtst6 - #- apt --assume-yes install realpath - script: - - "JAWT_LIB=$(find / -name libjawt.so -print -quit)" - - "echo JAWT_LIB: $JAWT_LIB" - - "JAWT_FOLDER=$(dirname ${JAWT_LIB})" - - "echo JAWT_FOLDER: $JAWT_FOLDER" - - "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}" - - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml - except: - - master + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY tags: - - se + - docker + script: + - mvn clean install -s settings.xml + - cd docker + - sh ./build.sh + - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:latest + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - docker push $CI_REGISTRY_IMAGE:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index 5ca1de0..69d16f1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,10 +10,14 @@ FROM openjdk:8 WORKDIR /app -COPY HardwareEmulator.so ./ +RUN apt-get update && \ + apt-get install -y --no-install-recommends libxext6 libxrender1 libxtst6 && \ + rm -rf /var/lib/apt/lists/* && \ + echo "export LD_LIBRARY_PATH=/usr/local/openjdk-8/jre/lib/amd64" > ~/.bashrc + + COPY rmi-model-server.jar ./rmi-model-server.jar COPY ./autopilots/ ./autopilots/ -COPY ./autopilots/ ./autopilots/AutopilotAdapter -CMD exec java -cp rmi-model-server.jar -Djava.rmi.server.codebase=file:rmi-model-server.jar -Djava.rmi.server.hostname=localhost rwth.rmi.model.server.RMIServer 10101 autopilots --no-zookeeper \ - no_time os=linux +CMD exec bash -c "source ~/.bashrc && java -jar rmi-model-server.jar -Djava.rmi.server.hostname=localhost port=10101 autopilots_folder=autopilots no-zookeeper \ + no_time os=linux" diff --git a/docker/build.sh b/docker/build.sh old mode 100644 new mode 100755 index c52b23d..70e10fa --- a/docker/build.sh +++ b/docker/build.sh @@ -7,8 +7,6 @@ # -rm rmi-model-server-*.jar -cp ../target/rmi-model-server-*-jar-with-dependencies.jar ./rmi-model-server.jar -cp ../install/HardwareEmulator.so ./ +cp ../install/rmi-model-server.jar ./ docker build -t rmi-server . -- GitLab From 3a1f06ccce447d98f8aaab2aa5c2af0fbdf4e497 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 13:42:26 +0200 Subject: [PATCH 02/11] Fix CI --- .gitlab-ci.yml | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd81e3f..273d8ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,26 +37,29 @@ masterJobWindows: tags: - Windows10 -# BranchJobLinux: -# stage: build -# image: maven:3-jdk-8 -# before_script: -# - apt update -# - apt --assume-yes install libxext6 -# - apt --assume-yes install libxrender1 -# - apt --assume-yes install libxtst6 -# #- apt --assume-yes install realpath -# script: -# - "JAWT_LIB=$(find / -name libjawt.so -print -quit)" -# - "echo JAWT_LIB: $JAWT_LIB" -# - "JAWT_FOLDER=$(dirname ${JAWT_LIB})" -# - "echo JAWT_FOLDER: $JAWT_FOLDER" -# - "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}" -# - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -# except: -# - master -# tags: -# - se +BranchJobLinux: + stage: build + image: maven:3-jdk-8 + before_script: + - apt update + - apt --assume-yes install libxext6 + - apt --assume-yes install libxrender1 + - apt --assume-yes install libxtst6 + #- apt --assume-yes install realpath + script: + - "JAWT_LIB=$(find / -name libjawt.so -print -quit)" + - "echo JAWT_LIB: $JAWT_LIB" + - "JAWT_FOLDER=$(dirname ${JAWT_LIB})" + - "echo JAWT_FOLDER: $JAWT_FOLDER" + - "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}" + - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml + except: + - master + tags: + - se + artifacts: + paths: + - target/rmi-model-server.jar BranchJobLinux: image: docker:dind -- GitLab From ba2b4fdadb026a3eb9c43cffa61354c552ac2b3b Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 13:43:14 +0200 Subject: [PATCH 03/11] Fix CI --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 273d8ce..bb67e1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,6 @@ BranchJobLinux: tags: - docker script: - - mvn clean install -s settings.xml - cd docker - sh ./build.sh - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -- GitLab From 8d4f47542cc0cff99ade03025d79d7e86acaadd1 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:21:40 +0200 Subject: [PATCH 04/11] Fix CI --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb67e1e..043f5ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ stages: - build +- docker masterJobLinux: stage: build @@ -63,7 +64,7 @@ BranchJobLinux: BranchJobLinux: image: docker:dind - stage: build + stage: docker before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY tags: -- GitLab From d56734246705e813076cd50a8bd38ca8ed89ec29 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:22:25 +0200 Subject: [PATCH 05/11] Fix CI --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 043f5ab..da3da9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,8 @@ masterJobWindows: - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml tags: - Windows10 + only: + - master BranchJobLinux: stage: build -- GitLab From 76f7b7962948067ecd3137788d10a3bae10c7568 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:25:38 +0200 Subject: [PATCH 06/11] Fix CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da3da9c..9715f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ BranchJobLinux: paths: - target/rmi-model-server.jar -BranchJobLinux: +BranchJobDocker: image: docker:dind stage: docker before_script: -- GitLab From 67b70734014d5e56e2cbec5bfcc791ab350da236 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:28:00 +0200 Subject: [PATCH 07/11] Fix CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9715f4d..04333b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ BranchJobLinux: - se artifacts: paths: - - target/rmi-model-server.jar + - install/rmi-model-server.jar BranchJobDocker: image: docker:dind -- GitLab From 1ca21049bd35d40a369810d46bb862ecbd2f4c0b Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:32:47 +0200 Subject: [PATCH 08/11] Fix docker build --- docker/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/build.sh b/docker/build.sh index 70e10fa..2bd11a9 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -8,5 +8,6 @@ cp ../install/rmi-model-server.jar ./ +cp -r ../install/autopilots ./ docker build -t rmi-server . -- GitLab From 49330b0bfebf48c0712e84174071fbb2d9d5f32f Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:33:50 +0200 Subject: [PATCH 09/11] Fix docker build --- docker/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build.sh b/docker/build.sh index 2bd11a9..06c302d 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -8,6 +8,6 @@ cp ../install/rmi-model-server.jar ./ -cp -r ../install/autopilots ./ +cp -r ../install/autopilots ./autopilots docker build -t rmi-server . -- GitLab From 7e9fb5fe2076e407c808fd7d4c7417eb55ec63cc Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 15:52:26 +0200 Subject: [PATCH 10/11] Publish docker image only in master branch --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04333b1..deedc26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,9 @@ masterJobLinux: - master tags: - se + artifacts: + paths: + - install/rmi-model-server.jar masterJobWindows: stage: build @@ -60,11 +63,8 @@ BranchJobLinux: - master tags: - se - artifacts: - paths: - - install/rmi-model-server.jar -BranchJobDocker: +masterJobDocker: image: docker:dind stage: docker before_script: @@ -78,3 +78,5 @@ BranchJobDocker: - docker tag rmi-server:latest $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker push $CI_REGISTRY_IMAGE:latest + only: + - master -- GitLab From 8f83922ba0132d723069692c301d2c41a3f8d3a5 Mon Sep 17 00:00:00 2001 From: Hengwen Zhang Date: Wed, 2 Oct 2019 22:00:25 +0200 Subject: [PATCH 11/11] Update default rmi setting --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 69d16f1..695524a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,4 +20,4 @@ COPY rmi-model-server.jar ./rmi-model-server.jar COPY ./autopilots/ ./autopilots/ CMD exec bash -c "source ~/.bashrc && java -jar rmi-model-server.jar -Djava.rmi.server.hostname=localhost port=10101 autopilots_folder=autopilots no-zookeeper \ - no_time os=linux" + no_time os=windows" -- GitLab