From 8449a3784efa43e4fc60a06b8aa2a6a1a844dc70 Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 19:54:43 +0200 Subject: [PATCH 1/6] Build docker image in ci --- .travis.yml | 56 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75fbaf2..d1aee7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,35 @@ -language: node_js -node_js: - - "10" -env: - - CXX=g++-4.8 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ - - sudo apt-get install -qq xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev -install: - - npm install - - wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip - - unzip -q test_data.zip -d test_data -script: - - xvfb-run --server-args="-screen 0 1024x768x24" npm test +jobs: + include: + - language: node_js + node_js: + - "10" + env: + - CXX=g++-4.8 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + before_install: + - sudo apt-get update -qq + - sudo apt-get install -qq libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ + - sudo apt-get install -qq xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev + install: + - npm install + - wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip + - unzip -q test_data.zip -d test_data + script: + - xvfb-run --server-args="-screen 0 1024x768x24" npm test + - language: ruby + services: + - docker + before_install: + - docker build -t aktionskarten/tileserver-gl + - docker run -d -p 127.0.0.1:80:4567 aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec foreman start;" + - docker ps -a + - docker run aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec rake test" + script: + - bundle exec rake test + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker push From ca197a49902e5ceda6fafa14d942934be3d6437f Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 20:04:39 +0200 Subject: [PATCH 2/6] Add argument to docker build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1aee7a..c6f6946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ jobs: services: - docker before_install: - - docker build -t aktionskarten/tileserver-gl + - docker build -t aktionskarten/tileserver-gl . - docker run -d -p 127.0.0.1:80:4567 aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec foreman start;" - docker ps -a - docker run aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec rake test" From 9f108d1c227c94b99835af944fd47b57b3a33094 Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 20:09:56 +0200 Subject: [PATCH 3/6] Adjust path --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6f6946..e1c9667 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,9 +26,9 @@ jobs: - docker before_install: - docker build -t aktionskarten/tileserver-gl . - - docker run -d -p 127.0.0.1:80:4567 aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec foreman start;" + - docker run -d -p 127.0.0.1:80:4567 aktionskarten/tileserver-gl /bin/sh -c "cd /root/tileserver-gl; bundle exec foreman start;" - docker ps -a - - docker run aktionskarten/tileserver-gl /bin/sh -c "cd /root/sinatra; bundle exec rake test" + - docker run aktionskarten/tileserver-gl /bin/sh -c "cd /root/tileserver-gl; bundle exec rake test" script: - bundle exec rake test - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin From 76a24011a37fed49e49f766b20e01b74d7c6d853 Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 20:24:28 +0200 Subject: [PATCH 4/6] Remove unnecessary docker commands --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1c9667..27dee6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,6 @@ jobs: - docker before_install: - docker build -t aktionskarten/tileserver-gl . - - docker run -d -p 127.0.0.1:80:4567 aktionskarten/tileserver-gl /bin/sh -c "cd /root/tileserver-gl; bundle exec foreman start;" - - docker ps -a - - docker run aktionskarten/tileserver-gl /bin/sh -c "cd /root/tileserver-gl; bundle exec rake test" script: - - bundle exec rake test - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker push From 87715735cf000196b622ec29f5cecfd1216a2e6e Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 20:29:49 +0200 Subject: [PATCH 5/6] Add argument to docker push --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27dee6f..f68ac7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,4 +28,4 @@ jobs: - docker build -t aktionskarten/tileserver-gl . script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker push + - docker push aktionskarten/tileserver-gl From d51725ba4bd6f311441f1306b6c4192455a7c0d0 Mon Sep 17 00:00:00 2001 From: Kohl Listi Date: Tue, 20 Jul 2021 20:33:46 +0200 Subject: [PATCH 6/6] Change aktionskarten to kombinat451 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f68ac7a..cbc8a07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ jobs: services: - docker before_install: - - docker build -t aktionskarten/tileserver-gl . + - docker build -t kombinat451/tileserver-gl . script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker push aktionskarten/tileserver-gl + - docker push kombinat451/tileserver-gl