From 37e4d06859c2179276df9dfb5e39941d17af6497 Mon Sep 17 00:00:00 2001 From: Aleksandr Volochnev Date: Tue, 17 Dec 2019 23:55:06 +0100 Subject: [PATCH 1/7] CI Pipeline First Step --- .travis.yml | 13 +++++++++++-- docker-compose.ci.yaml | 28 ++++++++++++++++++++++++++++ killrvideo.env | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 docker-compose.ci.yaml diff --git a/.travis.yml b/.travis.yml index e8a6607..fc56eff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,26 @@ services: # Build the app and a docker image script: +- travis_fold start docker_build - docker build -t ${TRAVIS_COMMIT} . +- travis_fold end docker_build +- travis_fold start docker_dependencies_up +- docker-compose -f docker-compose.ci.yml up -d +- travis_fold end docker_dependencies_up +- docker run --network killrvideo-java_default killrvideo/killrvideo-integration-tests # If successful, see if we need to publish also after_success: -- test -z $TRAVIS_TAG && travis_terminate 0 +- "[ \"$TRAVIS_EVENT_TYPE\" = \"cron\" ] && { echo \"Ignore nightly builds\"; travis_terminate 0; }" +- test -z $TRAVIS_TAG && { echo "Ignore non-tagged builds"; travis_terminate 0; } - docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:${TRAVIS_TAG} - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin - docker push killrvideo/killrvideo-nodejs:${TRAVIS_TAG} - "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:latest; docker push killrvideo/killrvideo-nodejs:latest; }" +after_failure: +- docker-compose -f docker-compose.ci.yml logs dse-config backend + env: global: # DOCKER_USER @@ -30,4 +40,3 @@ notifications: slack: rooms: secure: Eh/HI7+7KAUlzFpl9ViMUpExt4YXXWa5rEcwW3h/zIAo/UVghstuoCnk/CWbY/4SyrBeFO7iGcAc396GrBHbkJA25Iz+z3M7VYI/v22di1P8DeWguLNxbe1/wwCAbneYlxLbpPmkOKuFVho5NWDF1QgGszWONRM6DyiFiPlMF84nUcZEHP9exRELGqY64Cg3gfaKMXBn+QSZ5dzNH5cgVrWsGmPSeVBSTWZnZUYHWFKTbgnkY0bs1aHQefRAvl2CCZY/eFPJtcM9oIyIOiuX0NVz7h971tFJdJ9zpTesmaSVOjhCT00mUEJnPPI+zFJxLyIiXHjwROZXzCZL3J21DuWAb3+3ndVe6f47ao/4VNR/Q1TNJGIw5ewkA7RHHW9fegF27OzF+ddfd88ExFvBh1PvJXlAO3c050/2dIqDw7ovhIZWHFchUjSaoV6o5mkgv8/rEu76o3cpdAa78kgZ2tqzDQSquIY55eyHY1vDRusLYii5QZkXzblN9Hm/VvWuM//X99XtoFfnloeLcARWu6ze0fnsBeexK6iQMuUqseLZTjF3tnFqVe2cArA7Swwkh77fRWT3jm35FX1SHaT/kecsMiPY/E7sBfFGHjHVqSfEwMYXhJ6O3aur0UssB+UpuzWu+yBCkf7TienwzimXMrvOGnE++dSOxx6mXRaJBhI= - diff --git a/docker-compose.ci.yaml b/docker-compose.ci.yaml new file mode 100644 index 0000000..6a94a6a --- /dev/null +++ b/docker-compose.ci.yaml @@ -0,0 +1,28 @@ +version: '3' +services: + backend: + build: . + volumes: + - .:/usr/src/app + depends_on: + - dse + env_file: ./killrvideo.env + environment: + NODE_ENV: development + + dse: + image: datastax/dse-server:6.7.0 + command: [ -s -g ] + env_file: ./killrvideo.env + environment: + DS_LICENSE: accept + cap_add: + - IPC_LOCK + ulimits: + memlock: -1 + + dse-config: + image: killrvideo/killrvideo-dse-config:3.0.0-rc1 + env_file: ./killrvideo.env + depends_on: + - dse diff --git a/killrvideo.env b/killrvideo.env index 317c6ef..9adc738 100644 --- a/killrvideo.env +++ b/killrvideo.env @@ -1,4 +1,4 @@ KILLRVIDEO_DSE_USERNAME=cassandra KILLRVIDEO_DSE_PASSWORD=cassandra KILLRVIDEO_LOGGING_LEVEL=debug -DS_LICENSE: accept +DS_LICENSE=accept From b6b231e72e2f3434ab164ed4d4bde79cf2cba69f Mon Sep 17 00:00:00 2001 From: Aleksandr Volochnev Date: Tue, 17 Dec 2019 23:59:08 +0100 Subject: [PATCH 2/7] CI First fix --- .travis.yml | 2 +- docker-compose.ci.yaml => docker-compose.ci.yml | 0 docker-compose.yaml => docker-compose.yml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename docker-compose.ci.yaml => docker-compose.ci.yml (100%) rename docker-compose.yaml => docker-compose.yml (100%) diff --git a/.travis.yml b/.travis.yml index fc56eff..d473c6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: - travis_fold start docker_dependencies_up - docker-compose -f docker-compose.ci.yml up -d - travis_fold end docker_dependencies_up -- docker run --network killrvideo-java_default killrvideo/killrvideo-integration-tests +- docker run --network killrvideo-nodejs_default killrvideo/killrvideo-integration-tests # If successful, see if we need to publish also after_success: diff --git a/docker-compose.ci.yaml b/docker-compose.ci.yml similarity index 100% rename from docker-compose.ci.yaml rename to docker-compose.ci.yml diff --git a/docker-compose.yaml b/docker-compose.yml similarity index 100% rename from docker-compose.yaml rename to docker-compose.yml From 2f7f32a30868564c9cc3ff570a5cff41983de4b3 Mon Sep 17 00:00:00 2001 From: Aleksandr Volochnev Date: Wed, 18 Dec 2019 00:31:57 +0100 Subject: [PATCH 3/7] CI Second fix --- .travis.yml | 4 +++- docker-compose.ci.yml | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d473c6c..8f9f3bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,12 @@ services: # Build the app and a docker image script: - travis_fold start docker_build -- docker build -t ${TRAVIS_COMMIT} . +- docker build -t ${TRAVIS_COMMIT} -t killrvideo-nodejs-local . - travis_fold end docker_build - travis_fold start docker_dependencies_up - docker-compose -f docker-compose.ci.yml up -d +- sleep 300 +- docker-compose -f docker-compose.ci.yml logs dse-config - travis_fold end docker_dependencies_up - docker run --network killrvideo-nodejs_default killrvideo/killrvideo-integration-tests diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 6a94a6a..14f1866 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -1,9 +1,7 @@ version: '3' services: backend: - build: . - volumes: - - .:/usr/src/app + image: killrvideo-nodejs-local depends_on: - dse env_file: ./killrvideo.env From 223d78bb90a9113e44da4286515d61979857d54e Mon Sep 17 00:00:00 2001 From: Aleksandr Volochnev Date: Wed, 18 Dec 2019 00:48:36 +0100 Subject: [PATCH 4/7] CI Readability Improvement --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8f9f3bb..b92ed36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ after_success: - "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:latest; docker push killrvideo/killrvideo-nodejs:latest; }" after_failure: +- travis_fold start logs - docker-compose -f docker-compose.ci.yml logs dse-config backend +- travis_fold end logs env: global: From c2ab5044f31cc7f7c2b77131459bca7fdf81cab5 Mon Sep 17 00:00:00 2001 From: Aleks Volochnev Date: Mon, 30 Mar 2020 13:20:04 +0200 Subject: [PATCH 5/7] Updated travis to release minor and major version docker images --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b92ed36..fae226a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,9 @@ after_success: - docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:${TRAVIS_TAG} - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin - docker push killrvideo/killrvideo-nodejs:${TRAVIS_TAG} -- "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:latest; docker push killrvideo/killrvideo-nodejs:latest; }" +- "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:latest; docker push killrvideo/killrvideo-nodejs:latest; }" +- "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:$(echo $TRAVIS_TAG | cut -d'.' -f 1); docker push killrvideo/killrvideo-nodejs:$(echo $TRAVIS_TAG | cut -d'.' -f 1); }" +- "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-nodejs:$(echo $TRAVIS_TAG | cut -d'.' -f 1).$(echo $TRAVIS_TAG | cut -d'.' -f 2); docker push killrvideo/killrvideo-nodejs:$(echo $TRAVIS_TAG | cut -d'.' -f 1).$(echo $TRAVIS_TAG | cut -d'.' -f 2); }" after_failure: - travis_fold start logs From eb54d42236595ffb1923875ea6695a9038c9147d Mon Sep 17 00:00:00 2001 From: Aleks Volochnev Date: Wed, 1 Apr 2020 11:21:05 +0200 Subject: [PATCH 6/7] Update docker-compose.ci.yml Soften reqs for dse-config service --- docker-compose.ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 14f1866..e0a18a8 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -20,7 +20,7 @@ services: memlock: -1 dse-config: - image: killrvideo/killrvideo-dse-config:3.0.0-rc1 + image: killrvideo/killrvideo-dse-config:3 env_file: ./killrvideo.env depends_on: - dse From 0aaeed07d58f48e12d25cf962eaf866a276bbc51 Mon Sep 17 00:00:00 2001 From: Aleks Volochnev Date: Wed, 1 Apr 2020 11:22:16 +0200 Subject: [PATCH 7/7] Update docker-compose.yml Soften reqs for generator, web, dse-config services --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 25c56fe..10831c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: # Frontend web: - image: killrvideo/killrvideo-web:3.0.0-rc1 + image: killrvideo/killrvideo-web:3 env_file: ./killrvideo.env ports: - "3000:3000" @@ -39,14 +39,14 @@ services: # DSE Configurator to setup DSE dse-config: - image: killrvideo/killrvideo-dse-config:3.0.0-rc1 + image: killrvideo/killrvideo-dse-config:3 env_file: ./killrvideo.env depends_on: - dse # Sample Data Generator generator: - image: killrvideo/killrvideo-generator:3.0.0-rc4 + image: killrvideo/killrvideo-generator:3 env_file: ./killrvideo.env depends_on: - dse