Merge branch 'master' into v2_final

.travis.yml

@@ -28,8 +28,6 @@ after_success:
 - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
 - docker push killrvideo/killrvideo-java:${TRAVIS_TAG}
 - "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-java:latest; docker push killrvideo/killrvideo-java:latest; }"
-- "[ \"$(git tag --sort=-v:refname | grep -P \"^\\d+.\\d+.\\d+$\" | head -n1)\" == \"$TRAVIS_TAG\" ] && { docker tag ${TRAVIS_COMMIT} killrvideo/killrvideo-java:$(echo $TRAVIS_TAG | cut -d'.' -f 1); docker push killrvideo/killrvideo-java:$(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-java:$(echo $TRAVIS_TAG | cut -d'.' -f 1).$(echo $TRAVIS_TAG | cut -d'.' -f 2); docker push killrvideo/killrvideo-java:$(echo $TRAVIS_TAG | cut -d'.' -f 1).$(echo $TRAVIS_TAG | cut -d'.' -f 2); }"
 
 after_failure:
 - travis_fold start docker_logs

docker-compose.ci.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  backend:
+    image: killrvideo-java-local
+    depends_on:
+      - dse
+    environment:
+      KILLRVIDEO_LOGGING_LEVEL: debug
+      KILLRVIDEO_DSE_CONTACT_POINTS: dse
+
+  dse: 
+    image: datastax/dse-server:6.7.4
+    command: [ -s -g ]
+    environment:
+      DS_LICENSE: accept
+    cap_add:
+      - IPC_LOCK
+    ulimits:
+      memlock: -1
+
+  dse-config: 
+    image: killrvideo/killrvideo-dse-config:3.0.0
+    depends_on:
+      - dse

docker-compose.yml

@@ -14,7 +14,7 @@ version: '3'
 services:
 
   web: # Web Interface
-    image: killrvideo/killrvideo-web:3
+    image: killrvideo/killrvideo-web:3.0.1
     ports:
       - "3000:3000" # Exposes port to be available externally
     depends_on:
@@ -60,14 +60,14 @@ services:
 
   # One-Time Bootstrap Container, configures DSE to have required keyspaces etc.
   dse-config: 
-    image: killrvideo/killrvideo-dse-config:3
+    image: killrvideo/killrvideo-dse-config:3.0.0
     depends_on:
       - dse # Needs DSE to be running
 
   # Sample Data Generator, imitates behaviour of users on the killrVideo website. 
   # Adds comments and rates videos, upload new videos and so on.
   generator: 
-    image: killrvideo/killrvideo-generator:3
+    image: killrvideo/killrvideo-generator:3.0.2
     depends_on:
       - backend # Needs Backend to be running
     environment: