From 6c340c95916fc7bdeafa45b55296eb3e051e7337 Mon Sep 17 00:00:00 2001 From: arempter Date: Tue, 16 Apr 2019 14:35:53 +0200 Subject: [PATCH 1/2] rename project to rokku --- .travis.yml | 10 +++++----- README.md | 6 +++--- docker-compose.yml | 2 +- model/typedef-client_process.json | 2 +- resources/atlas-setup.sh | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index a58da1f..8b67e36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,11 @@ script: - export DOCKER_TAG="${TRAVIS_BRANCH/\//_}" - if [ "${TRAVIS_BRANCH}" != "master" ]; then echo "Build image for tag ${DOCKER_TAG}"; - docker pull wbaa/airlock-dev-apache-atlas:latest; - travis_wait 80 docker build --quiet -t wbaa/airlock-dev-apache-atlas:$DOCKER_TAG .; - docker push wbaa/airlock-dev-apache-atlas:$DOCKER_TAG; + docker pull wbaa/rokku-dev-apache-atlas:latest; + travis_wait 80 docker build --quiet -t wbaa/rokku-dev-apache-atlas:$DOCKER_TAG .; + docker push wbaa/rokku-dev-apache-atlas:$DOCKER_TAG; fi - if [ -n "$TRAVIS_TAG" ]; then - docker tag wbaa/airlock-dev-apache-atlas:$DOCKER_TAG wbaa/airlock-dev-apache-atlas:latest; - docker push wbaa/airlock-dev-apache-atlas:latest; + docker tag wbaa/rokku-dev-apache-atlas:$DOCKER_TAG wbaa/rokku-dev-apache-atlas:latest; + docker push wbaa/rokku-dev-apache-atlas:latest; fi diff --git a/README.md b/README.md index e697cd9..ae1ef84 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.org/ing-bank/airlock-dev-apache-atlas.svg?branch=master)](https://travis-ci.org/ing-bank/airlock-dev-apache-atlas) -[![](https://images.microbadger.com/badges/image/wbaa/airlock-dev-apache-atlas:latest.svg)](https://microbadger.com/images/wbaa/airlock-dev-apache-atlas:latest) +[![Build Status](https://travis-ci.org/ing-bank/rokku-dev-apache-atlas.svg?branch=master)](https://travis-ci.org/ing-bank/rokku-dev-apache-atlas) +[![](https://images.microbadger.com/badges/image/wbaa/rokku-dev-apache-atlas:latest.svg)](https://microbadger.com/images/wbaa/rokku-dev-apache-atlas:latest) -# Airlock Dev - Apache Atlas +# Rokku Dev - Apache Atlas ## Background diff --git a/docker-compose.yml b/docker-compose.yml index 90089ec..8aaaddc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: atlas-server: build: . - image: wbaa/airlock-dev-apache-atlas + image: wbaa/rokku-dev-apache-atlas ports: - "21000:21000" depends_on: diff --git a/model/typedef-client_process.json b/model/typedef-client_process.json index 01e204f..b4b4a7c 100644 --- a/model/typedef-client_process.json +++ b/model/typedef-client_process.json @@ -3,7 +3,7 @@ { "superTypes" : [ "Process" ], "category" : "ENTITY", - "name" : "airlock_client", + "name" : "rokku_client", "description" : "a type definition for AWS tools", "typeVersion" : "1.1", "attributeDefs" : [ diff --git a/resources/atlas-setup.sh b/resources/atlas-setup.sh index d45ebd2..8bdf21e 100755 --- a/resources/atlas-setup.sh +++ b/resources/atlas-setup.sh @@ -29,9 +29,9 @@ if [ "$start_timeout_exceeded" = "false" ]; then printf "\nclassifications type created\n" # Setup atlas services - printf "Creating airlock_client type... \n" + printf "Creating rokku_client type... \n" curl -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -u admin:admin 'http://localhost:21000/api/atlas/v2/types/typedefs' -d @/tmp/model/typedef-client_process.json - printf "\nairlock_client created\n" + printf "\nrokku_client created\n" sleep 15 echo "Done setting up Atlas types " From b8a67ac8125f273149bf9694b531ff24f2972fe3 Mon Sep 17 00:00:00 2001 From: arempter Date: Wed, 17 Apr 2019 08:16:41 +0200 Subject: [PATCH 2/2] travis hung --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ae1ef84..63dfac9 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ As base image Centos 7 has been used http://localhost:21000 ``` -or verify that server is up and running using +Or verify that server is up and running using ``` curl -u admin:admin http://localhost:21000/api/atlas/admin/version ```